diff --git a/Arduino Code/Arduino Libraries/HanConfigAp/src/HanConfigAp.cpp b/Arduino Code/Arduino Libraries/HanConfigAp/src/HanConfigAp.cpp
index 2286950a..def4e8e0 100644
--- a/Arduino Code/Arduino Libraries/HanConfigAp/src/HanConfigAp.cpp	
+++ b/Arduino Code/Arduino Libraries/HanConfigAp/src/HanConfigAp.cpp	
@@ -28,22 +28,28 @@ void HanConfigAp::setup(int accessPointButtonPin, Stream* debugger)
 		config.load();
 		if (this->debugger) config.print(this->debugger);
 
-		// Test if we're holding down the AP pin, over 5 seconds
-		int time = millis() + 5000;
-		print("Press the AP button now to boot as access point");
-		while (millis() < time)
+		if (accessPointButtonPin != INVALID_BUTTON_PIN)
 		{
-			print(".");
-			if (digitalRead(accessPointButtonPin) == LOW)
+			// Assign pin for boot as AP
+			pinMode(accessPointButtonPin, INPUT_PULLUP);
+
+			// Test if we're holding down the AP pin, over 5 seconds
+			int time = millis() + 5000;
+			print("Press the AP button now to boot as access point");
+			while (millis() < time)
 			{
-				print("AP button was pressed. Booting as access point now. Look for SSID ");
-				println(this->AP_SSID);
-				isActivated = true;
-				break;
+				print(".");
+				if (digitalRead(accessPointButtonPin) == LOW)
+				{
+					print("AP button was pressed. Booting as access point now. Look for SSID ");
+					println(this->AP_SSID);
+					isActivated = true;
+					break;
+				}
+				delay(100);
 			}
-			delay(100);
+			println("");
 		}
-		println("");
 	}
 
 	if (isActivated)
diff --git a/Arduino Code/Arduino Libraries/HanConfigAp/src/HanConfigAp.h b/Arduino Code/Arduino Libraries/HanConfigAp/src/HanConfigAp.h
index 9b46250a..42eab7c6 100644
--- a/Arduino Code/Arduino Libraries/HanConfigAp/src/HanConfigAp.h	
+++ b/Arduino Code/Arduino Libraries/HanConfigAp/src/HanConfigAp.h	
@@ -22,6 +22,8 @@
 #include <DNSServer.h>
 #include "configuration.h"
 
+#define INVALID_BUTTON_PIN  0xFFFFFFFF
+
 class HanConfigAp {
 public:
 	void setup(int accessPointButtonPin, Stream* debugger);