diff --git a/src/BrewPiLess.cpp b/src/BrewPiLess.cpp
index 4dd8f6375..67ea8509a 100644
--- a/src/BrewPiLess.cpp
+++ b/src/BrewPiLess.cpp
@@ -407,8 +407,8 @@ class BrewPiWebHandler: public AsyncWebHandler
 	 		String data=request->getParam("data", true, false)->value();
 	 		//DBG_PRINTF("putline:%s\n",data.c_str());
 
-			if(data.startsWith("j") && !request->authenticate(username, password))
-		        return request->requestAuthentication();
+			if(data.startsWith("j") && !request->authenticate(username, password, DEFAULT_NAME))
+		        return request->requestAuthentication(DEFAULT_NAME);
 
 	 		brewPi.putLine(data.c_str());
 	 		request->send(200,"application/json","{}");
@@ -427,8 +427,8 @@ class BrewPiWebHandler: public AsyncWebHandler
 		 else if(request->method() == HTTP_GET && request->url() == CONFIG_PATH){
 			request->redirect(request->url() + ".htm");
 	 	}else if(request->method() == HTTP_POST && request->url() == CONFIG_PATH){
-	 	    if(!request->authenticate(username, password))
-	        return request->requestAuthentication();
+	 	    if(!request->authenticate(username, password, DEFAULT_NAME))
+	        return request->requestAuthentication(DEFAULT_NAME);
 
 			if(request->hasParam("data", true)){
 
@@ -472,27 +472,27 @@ class BrewPiWebHandler: public AsyncWebHandler
 				AsyncWebParameter* tvalue = request->getParam("off", true);
 				DBG_PRINTF("Set timezone:%ld\n",tvalue->value().toInt());
 			   TimeKeeper.setTimezoneOffset(tvalue->value().toInt());
-		    }		   
+		    }
 			request->send(200,"application/json","{}");
-			 
+
 		}else if(request->method() == HTTP_GET &&  request->url() == RESETWIFI_PATH){
-	 	    if(!request->authenticate(username, password))
-	        return request->requestAuthentication();
+	 	    if(!request->authenticate(username, password, DEFAULT_NAME))
+	        return request->requestAuthentication(DEFAULT_NAME);
 		 	request->send(200,"text/html","Done, restarting..");
 			requestRestart(true);
 	 	}else if(request->method() == HTTP_POST &&  request->url() == FLIST_PATH){
-	 	    if(!request->authenticate(username, password))
-	        return request->requestAuthentication();
+	 	    if(!request->authenticate(username, password, DEFAULT_NAME))
+	        return request->requestAuthentication(DEFAULT_NAME);
 
 			handleFileList(request);
 	 	}else if(request->method() == HTTP_DELETE &&  request->url() == DELETE_PATH){
-	 	    if(!request->authenticate(username, password))
-	        return request->requestAuthentication();
+	 	    if(!request->authenticate(username, password, DEFAULT_NAME))
+	        return request->requestAuthentication(DEFAULT_NAME);
 
 			handleFileDelete(request);
 	 	}else if(request->method() == HTTP_POST &&  request->url() == FPUTS_PATH){
-	 	    if(!request->authenticate(username, password))
-	        return request->requestAuthentication();
+	 	    if(!request->authenticate(username, password, DEFAULT_NAME))
+	        return request->requestAuthentication(DEFAULT_NAME);
 
 			handleFilePuts(request);
 		}else if(request->method() == HTTP_GET && request->url() == GETSTATUS_PATH){
@@ -538,8 +538,8 @@ class BrewPiWebHandler: public AsyncWebHandler
 		#endif
 		#if AUTO_CAP
 		else if(request->url() == CAPPER_PATH){
-	 	    if(!request->authenticate(username, password))
-	        return request->requestAuthentication();
+	 	    if(!request->authenticate(username, password, DEFAULT_NAME))
+	        return request->requestAuthentication(DEFAULT_NAME);
 			// auto cap.
 			bool response=true;
 			if(request->hasParam("cap")){
@@ -584,8 +584,8 @@ class BrewPiWebHandler: public AsyncWebHandler
 					}
 			}
 
-	 	    if(auth && !request->authenticate(username, password))
-	        return request->requestAuthentication();
+	 	    if(auth && !request->authenticate(username, password, DEFAULT_NAME))
+	        return request->requestAuthentication(DEFAULT_NAME);
 
 	 		sendFile(request,path); //request->send(SPIFFS, path);
 		}
@@ -1031,10 +1031,10 @@ class ExternalDataHandler:public AsyncWebHandler
 		if(length ==0) return request->send(500);;
 
         uint8_t error;
-		if(externalData.processJSON(data,length,request->authenticate(username, password),error)){
+		if(externalData.processJSON(data,length,request->authenticate(username, password, DEFAULT_NAME),error)){
     		request->send(200,"application/json","{}");
 		}else{
-		    if(error == ErrorAuthenticateNeeded) return request->requestAuthentication();
+		    if(error == ErrorAuthenticateNeeded) return request->requestAuthentication(DEFAULT_NAME);
 		    else request->send(500);
 		}
 	}
diff --git a/src/Config.h b/src/Config.h
index 6da2cc693..5ddbb941e 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -396,6 +396,10 @@
 
 #define EMIWorkaround 1
 #define BPL_VERSION "2.7"
+#define DEFAULT_NAME "brewpiless"
+#define DEFAULT_USERNAME DEFAULT_NAME
+#define DEFAULT_PASS DEFAULT_NAME
+
 
 #ifndef EanbleParasiteTempControl
 #define EanbleParasiteTempControl 0
diff --git a/src/WiFiSetup.h b/src/WiFiSetup.h
index 6b1b501b4..c9748dd34 100644
--- a/src/WiFiSetup.h
+++ b/src/WiFiSetup.h
@@ -21,7 +21,7 @@ class WiFiSetupClass
 //    void preInit(void);
 	void setNetwork(WiFiMode mode,IPAddress ip,IPAddress gw,IPAddress mask);
 
-	void begin(void){begin("brewpiless");}
+	void begin(void){begin(DEFAULT_NAME);}
 	void begin(char const *ssid,const char *passwd=NULL);
 	void beginAP(char const *ssid,const char *passwd=NULL);