diff --git a/source/ubinstall-gtk-page-switch.c b/source/ubinstall-gtk-page-switch.c
index aa5e0d6..fd9c386 100644
--- a/source/ubinstall-gtk-page-switch.c
+++ b/source/ubinstall-gtk-page-switch.c
@@ -17,7 +17,7 @@ enum YON_PAGES yon_page_get_next(main_window *widgets, enum YON_PAGES page){
             } else if (strcmp(config(AUTOINSTALL_TYPE_INSTALL),"data_only")){
                 return YON_PAGE_INSTALLATION;
             } else {
-                return YON_PAGE_RECOVERY_PROCESS;
+                return YON_PAGE_RECOVERY_BEGIN;
             } 
         } break;
         case YON_PAGE_KERNEL: return YON_PAGE_CONFIG_HUB; break;
@@ -37,11 +37,11 @@ enum YON_PAGES yon_page_get_next(main_window *widgets, enum YON_PAGES page){
         case YON_PAGE_INSTALL_SAME_PARTITION: return YON_PAGE_OS_COMPONENTS; break;
         case YON_PAGE_INSTALL_ADVANCED: return YON_PAGE_OS_COMPONENTS; break;
         case YON_PAGE_INSTALL_RECOVERY: return yon_recovery_get_next(widgets); break;
-        case YON_PAGE_RECOVERY_GRUB_INSTALL: return main_config.configure_mode?YON_PAGE_CONFIGURE_END:YON_PAGE_RECOVERY_BEGIN; break;
-        case YON_PAGE_RECOVERY_GRUB_UPDATE: return main_config.configure_mode?YON_PAGE_CONFIGURE_END:YON_PAGE_RECOVERY_BEGIN; break;
+        case YON_PAGE_RECOVERY_GRUB_INSTALL: return main_config.configure_mode?YON_PAGE_CONFIGURE_END:YON_PAGE_CONFIG_HUB; break;
+        case YON_PAGE_RECOVERY_GRUB_UPDATE: return main_config.configure_mode?YON_PAGE_CONFIGURE_END:YON_PAGE_CONFIG_HUB; break;
         case YON_PAGE_RECOVERY_OS_ONLY: return main_config.configure_mode?YON_PAGE_CONFIGURE_END:YON_PAGE_OS_COMPONENTS; break;
-        case YON_PAGE_RECOVERY_USRDATA_ONLY: return main_config.configure_mode?YON_PAGE_CONFIGURE_END:YON_PAGE_RECOVERY_BEGIN; break;
-        case YON_PAGE_RECOVERY_BEGIN: main_config.save_configured = 1; return strcmp(config(AUTOINSTALL_TYPE_INSTALL),"data_only") ? YON_PAGE_RECOVERY_PROCESS: YON_PAGE_CONFIG_HUB; break;
+        case YON_PAGE_RECOVERY_USRDATA_ONLY: return main_config.configure_mode?YON_PAGE_CONFIGURE_END:YON_PAGE_CONFIG_HUB; break;
+        case YON_PAGE_RECOVERY_BEGIN: main_config.save_configured = 1; return YON_PAGE_RECOVERY_PROCESS; break;
         case YON_PAGE_RECOVERY_PROCESS: return YON_PAGE_RECOVERY_COMPLETION; break;
         case YON_PAGE_INSTALLATION: return YON_PAGE_COMPLETION; break;
         case YON_PAGE_CONFIGURE_SAVE: