diff --git a/src/httpserver/http_fns.c b/src/httpserver/http_fns.c
index aa7bc4c4c..f1c6d38ea 100644
--- a/src/httpserver/http_fns.c
+++ b/src/httpserver/http_fns.c
@@ -563,7 +563,7 @@ int http_fn_index(http_request_t* request) {
 	{
 		for (i = 0;i < 29;i++)
 		{
-			if (PIN_GetPinRoleForPinIndex(i) == IOR_None)
+			if ((PIN_GetPinRoleForPinIndex(i) == IOR_None) && (i != 0) && (i != 1))
 			{
 				HAL_PIN_Setup_Input(i);
 			}
@@ -572,11 +572,12 @@ int http_fn_index(http_request_t* request) {
 		hprintf255(request, "<h5> PIN States<br>");
 		for (i = 0;i < 29;i++)
 		{
-			if (PIN_GetPinRoleForPinIndex(i) != IOR_None)
+			if ((PIN_GetPinRoleForPinIndex(i) != IOR_None) || (i == 0) || (i == 1))
 			{
 				hprintf255(request, "P%02i: NA ", i);
 			}
-			else {
+			else 
+            {
 				hprintf255(request, "P%02i: %i  ", i, (int)HAL_PIN_ReadDigitalInput(i));
 			}
 			if (i % 10 == 9)
diff --git a/src/user_main.c b/src/user_main.c
index 69e9071b6..81913aff9 100644
--- a/src/user_main.c
+++ b/src/user_main.c
@@ -551,6 +551,10 @@ void Main_Init()
 		// but DON't run autoexec if we have had 2+ boot failures
 		CMD_Init();
 
+        /* Automatic disable of PIN MONITOR after reboot */
+        if (CFG_HasFlag(OBK_FLAG_HTTP_PINMONITOR))
+            CFG_SetFlag(OBK_FLAG_HTTP_PINMONITOR, false);
+
 		// autostart drivers
 		if(PIN_FindPinIndexForRole(IOR_SM2135_CLK,-1) != -1 && PIN_FindPinIndexForRole(IOR_SM2135_DAT,-1) != -1) 
         {