diff --git a/components/cmd_system/cmd_system.c b/components/cmd_system/cmd_system.c
index c21fabf7..e24f56bb 100644
--- a/components/cmd_system/cmd_system.c
+++ b/components/cmd_system/cmd_system.c
@@ -138,12 +138,15 @@ static int restart(int argc, char **argv)
 {
     ESP_LOGW(TAG, "Restarting");
     esp_restart();
-
-//    guided_boot(ESP_PARTITION_SUBTYPE_APP_OTA_0);
-//    // If we're still alive, then there may not be an ota partition to boot from
-//    guided_boot(ESP_PARTITION_SUBTYPE_APP_FACTORY);
-//	return 0; // return fail.  This should never return... we're rebooting!
+    return 0;
 }
+
+void simple_restart()
+{
+	ESP_LOGW(TAG, "Restarting");
+    esp_restart();
+}
+
 esp_err_t guided_restart_ota(){
     guided_boot(ESP_PARTITION_SUBTYPE_APP_OTA_0);
     // If we're still alive, then there may not be an ota partition to boot from
diff --git a/components/cmd_system/cmd_system.h b/components/cmd_system/cmd_system.h
index add6d051..f3c6ad33 100644
--- a/components/cmd_system/cmd_system.h
+++ b/components/cmd_system/cmd_system.h
@@ -16,6 +16,7 @@ extern "C" {
 void register_system();
 esp_err_t guided_factory();
 esp_err_t guided_restart_ota();
+void simple_restart();
 
 #ifdef __cplusplus
 }
diff --git a/components/wifi-manager/code.js b/components/wifi-manager/code.js
index af504e7e..6d082d64 100644
--- a/components/wifi-manager/code.js
+++ b/components/wifi-manager/code.js
@@ -210,7 +210,7 @@ $(document).ready(function(){
                 console.log('sent config JSON with headers:', autoexec);
                 console.log('now triggering reboot');
                 $.ajax({
-                    url: '/reboot.json',
+                    url: '/reboot_ota.json',
                     dataType: 'text',
                     method: 'POST',
                     cache: false,
@@ -439,7 +439,10 @@ $(document).ready(function(){
     $('#boot-button').on("click", function(){
         enableStatusTimer = true;
     });
-
+    $('#reboot-button').on("click", function(){
+        enableStatusTimer = true;
+    });
+    
     $('#updateAP').on("click", function(){
         refreshAP(true);
         console.log("refresh AP");
@@ -656,7 +659,7 @@ function checkStatus(){
                 $("footer.footer").removeClass('sl');
                 $("footer.footer").addClass('recovery');
                 $("#boot-button").html('Reboot');
-                $("#boot-form").attr('action', '/reboot.json');
+                $("#boot-form").attr('action', '/reboot_ota.json');
                 enableStatusTimer = true;
             } else {
                 recovery = false;
diff --git a/components/wifi-manager/http_server.c b/components/wifi-manager/http_server.c
index 943e0d2d..2527f937 100644
--- a/components/wifi-manager/http_server.c
+++ b/components/wifi-manager/http_server.c
@@ -553,15 +553,25 @@ void http_server_netconn_serve(struct netconn *conn) {
 					netconn_write(conn, http_ok_json_no_cache_hdr, sizeof(http_ok_json_no_cache_hdr) - 1, NETCONN_NOCOPY); /* 200 ok */
 					ESP_LOGI(TAG, "http_server_netconn_serve: done serving DELETE /connect.json");
 				}
-				else if(strstr(line, "POST /reboot.json ")) {
+				else if(strstr(line, "POST /reboot_ota.json ")) {
 					ESP_LOGI(TAG, "http_server_netconn_serve: POST reboot.json");
+					netconn_write(conn, http_ok_json_no_cache_hdr, sizeof(http_ok_json_no_cache_hdr) - 1, NETCONN_NOCOPY); /* 200 ok */
 					netconn_close(conn);
 					netconn_delete(conn);
 					guided_restart_ota();
 					ESP_LOGI(TAG, "http_server_netconn_serve: done serving POST reboot.json");
 				}
+				else if(strstr(line, "POST /reboot.json ")) {
+					ESP_LOGI(TAG, "http_server_netconn_serve: POST restart.json");
+					netconn_write(conn, http_ok_json_no_cache_hdr, sizeof(http_ok_json_no_cache_hdr) - 1, NETCONN_NOCOPY); /* 200 ok */
+					netconn_close(conn);
+					netconn_delete(conn);
+					simple_restart();
+					ESP_LOGI(TAG, "http_server_netconn_serve: done serving POST restart.json");
+				}
 				else if(strstr(line, "POST /recovery.json ")) {
 					ESP_LOGI(TAG, "http_server_netconn_serve: POST recovery.json");
+					netconn_write(conn, http_ok_json_no_cache_hdr, sizeof(http_ok_json_no_cache_hdr) - 1, NETCONN_NOCOPY); /* 200 ok */
 					netconn_close(conn);
 					netconn_delete(conn);
 					guided_factory();
diff --git a/components/wifi-manager/index.html b/components/wifi-manager/index.html
index 1ac91529..281fefc1 100644
--- a/components/wifi-manager/index.html
+++ b/components/wifi-manager/index.html
@@ -266,6 +266,11 @@
                         </tbody>
                     </table>
                     <div class="buttons">
+						<div id="boot-div">
+                        	<form id="reboot-form" action="/reboot.json" method="post" target="dummyframe">
+                            	<button id="reboot-button" type="submit" class="btn btn-primary">Reboot</button>
+                        	</form>
+                    	</div>                    
                         <input id="save-nvs" type="button" class="btn btn-success" value="Save" />
                     </div>
                 </div>
diff --git a/main/console.c b/main/console.c
index 0d54d8d6..c4dc57f9 100644
--- a/main/console.c
+++ b/main/console.c
@@ -60,7 +60,7 @@ void process_autoexec(){
 		ESP_LOGW(TAG, "Procesing autoexec commands while wifi_manager active.  Wifi related commands will be ignored.");
 	}
 #if RECOVERY_APPLICATION
-	ESP_LOGD(TAG, "Processing autoexec commands in recovery mode.  Squeezelite commands will be ignored.")
+	ESP_LOGD(TAG, "Processing autoexec commands in recovery mode.  Squeezelite commands will be ignored.");
 #endif
 
 	if(str_flag !=NULL ){