diff --git a/source/ubinstall-gtk-bootloader.c b/source/ubinstall-gtk-bootloader.c
index 0c664e5..a9b074b 100644
--- a/source/ubinstall-gtk-bootloader.c
+++ b/source/ubinstall-gtk-bootloader.c
@@ -18,6 +18,11 @@ int yon_bootloader_save(main_window *widgets){
         yon_config_register(GRUB_SUPERUSERS_parameter,GRUB_SUPERUSERS_parameter_command,NULL);
         yon_config_set_status(GRUB_SUPERUSERS_parameter,-1);
     }
+
+    if (!gtk_switch_get_active(GTK_SWITCH(widgets->BootloadNoPasswordSwitch))){
+        yon_config_remove_by_key(GRUB_SUPERUSERS_parameter);
+
+    } else {
         GtkTreeIter iter;
         GtkTreeModel *model = GTK_TREE_MODEL(widgets->BootloadUsersList);
         for_iter(model,&iter){
@@ -31,6 +36,7 @@ int yon_bootloader_save(main_window *widgets){
                 yon_config_remove_by_key(GRUB_SUPERUSERS_parameter);
             }
         }
+    }
     
 
     if (!main_config.configure_mode){
@@ -475,7 +481,10 @@ void yon_bootloader_init(main_window *widgets){
     } else {
         gtk_entry_set_text(GTK_ENTRY(widgets->BootloadDefaultOSEntry),DEFAULT_BOOTLOAD_MENU_ITEM_LABEL);
     }
-    {
+    if (!admins&&!size){
+        gtk_switch_set_active(GTK_SWITCH(widgets->BootloadNoPasswordSwitch),0);
+    } else {
+        gtk_switch_set_active(GTK_SWITCH(widgets->BootloadNoPasswordSwitch),1);
         int admins_size;
         config_str admins_parsed = yon_char_parse(admins,&admins_size,",");
         GtkTreeIter iter;
diff --git a/source/ubinstall-gtk-page-switch.c b/source/ubinstall-gtk-page-switch.c
index 11668d5..b8893bd 100644
--- a/source/ubinstall-gtk-page-switch.c
+++ b/source/ubinstall-gtk-page-switch.c
@@ -149,7 +149,7 @@ void yon_navigation_buttons_set_sensetiveness(main_window *widgets){
     gtk_widget_hide(widgets->StartScenarioButton);
     switch(page){
         case YON_PAGE_WELCOME:
-            yon_load_proceed(YON_CONFIG_LOCAL);
+            // yon_load_proceed(YON_CONFIG_LOCAL);
             gtk_widget_hide(widgets->BackButton);
             gtk_widget_set_sensitive(widgets->NextButton,1);
             gtk_widget_set_sensitive(widgets->CancelInstallButton,0);
diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c
index 9751093..371d4d0 100644
--- a/source/ubinstall-gtk.c
+++ b/source/ubinstall-gtk.c
@@ -700,6 +700,7 @@ void yon_main_window_create(main_window *widgets){
         widgets->BootloadUserEditButton = yon_gtk_builder_get_widget(builder,"BootloadUserEditButton");
         widgets->BootloadAdminCheckCell = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"BootloadAdminCheckCell"));
         widgets->BootloadUserRemoveButton = yon_gtk_builder_get_widget(builder,"BootloadUserRemoveButton");
+        widgets->BootloadNoPasswordSwitch = yon_gtk_builder_get_widget(builder,"BootloadNoPasswordSwitch");
         widgets->BootloadUsersList = GTK_LIST_STORE(gtk_builder_get_object(builder,"BootloadUsersList"));
 
         widgets->NetworkDomainSwitch = yon_gtk_builder_get_widget(builder,"NetworkDomainSwitch");
@@ -883,6 +884,7 @@ void yon_main_window_create(main_window *widgets){
         g_signal_connect(G_OBJECT(widgets->BootloadAdminCheckCell),"toggled",G_CALLBACK(on_bootloader_admin_toggled),widgets);
         g_signal_connect(G_OBJECT(widgets->BootloadUserRemoveButton),"clicked",G_CALLBACK(on_bootloader_user_remove),widgets);
         g_signal_connect(G_OBJECT(widgets->BootloadUserTree),"cursor-changed",G_CALLBACK(on_bootloader_selected),widgets);
+        g_signal_connect(G_OBJECT(widgets->BootloadNoPasswordSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch),gtk_widget_get_parent(gtk_widget_get_parent(widgets->BootloadUserAddButton)));
 
         g_signal_connect(G_OBJECT(widgets->BootloadTimerSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch),widgets->BootloadTimerSpin);
 
diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h
index f279cfc..e817c7d 100755
--- a/source/ubinstall-gtk.h
+++ b/source/ubinstall-gtk.h
@@ -777,7 +777,7 @@ typedef struct
 	GtkWidget *BootloadTimerSpin;
 	GtkWidget *BootloadDefaultOSEntry;
 	GtkWidget *BootloadDefaulOSButton;
-	// GtkWidget *BootloadNoPasswordSwitch;
+	GtkWidget *BootloadNoPasswordSwitch;
 	GtkWidget *BootloadUserAddButton;
 	GtkWidget *BootloadUserEditButton;
 	GtkCellRenderer *BootloadAdminCheckCell;
diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade
index bb4d4f4..9629206 100644
--- a/ubinstall-gtk.glade
+++ b/ubinstall-gtk.glade
@@ -6598,6 +6598,7 @@ Select a different installation sources.</property>
                                     <child>
                                       <object class="GtkBox">
                                         <property name="visible">True</property>
+                                        <property name="sensitive">False</property>
                                         <property name="can-focus">False</property>
                                         <property name="spacing">5</property>
                                         <child>