diff --git a/src/Network.cpp b/src/Network.cpp
index 5d33383..7de6045 100644
--- a/src/Network.cpp
+++ b/src/Network.cpp
@@ -403,7 +403,8 @@ int Network::getFormValue(char *formData, const char *tag, char *value, int maxS
       sscanf(v,"%2x",(unsigned int *)value++);
       v+=2;
     } else {
-      *value++=*v++;
+      *value++=(*v=='+'?' ':*v);                  // HTML Forms use '+' for spaces (and '+' signs are escaped)
+      v++;
     }
     len++;
   }
diff --git a/src/src.ino b/src/src.ino
index 60385c0..485e18d 100644
--- a/src/src.ino
+++ b/src/src.ino
@@ -22,7 +22,7 @@ void setup() {
   new SpanUserCommand('e',"- My second Description",userCom2);
 
   homeSpan.enableAutoStartAP();
-  homeSpan.setApFunction(myWiFiAP);
+//  homeSpan.setApFunction(myWiFiAP);
 
   homeSpan.begin(Category::Lighting,"HomeSpan Lamp Server","homespan");