diff --git a/installer/wad/0001000154484246.tmd b/installer/wad/0001000154484246.tmd
index 6dc9fc2..6edcf8b 100644
Binary files a/installer/wad/0001000154484246.tmd and b/installer/wad/0001000154484246.tmd differ
diff --git a/main/source/Prompts/prompt_end.cpp b/main/source/Prompts/prompt_end.cpp
index 5a65e12..2f6d076 100644
--- a/main/source/Prompts/prompt_end.cpp
+++ b/main/source/Prompts/prompt_end.cpp
@@ -5,6 +5,7 @@
 #include "main.h"
 #include "menu.h"
 #include "Tools/SelectIos.h"
+#include "xprintf.h"
 
 extern bool runaway;
 extern bool restarthbf;
@@ -54,16 +55,18 @@ endPrompt()
 	GuiImage systemmenuImgOver(&btn_over);
 	GuiImage shutdownImgOver(&btn_over);
 
-	GuiText bootmiiTxt(tr("Launch BootMii (IOS)"), 22, (GXColor){Theme.button_small_text_1, Theme.button_small_text_2, Theme.button_small_text_3, 255});
-	if(get_bootmii() == 3)
-        GuiText bootmiiTxt(tr("Launch BootMii (Boot2)"), 22, (GXColor){Theme.button_small_text_1, Theme.button_small_text_2, Theme.button_small_text_3, 255});
-	GuiButton bootmii(btn.GetWidth(), btn.GetHeight());
-	bootmii.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
-	bootmii.SetPosition(0, 75);
-	bootmii.SetLabel(&bootmiiTxt);
-	bootmii.SetImage(&bootmiiImg);
-	bootmii.SetImageOver(&bootmiiImgOver);
-	bootmii.SetTrigger(&trigA);
+    GuiText bootmiiTxtBoot2(tr("Launch BootMii (Boot2)"), 22, (GXColor){Theme.button_small_text_1, Theme.button_small_text_2, Theme.button_small_text_3, 255});
+    GuiText bootmiiTxtIOS(tr("Launch BootMii (IOS)"), 22, (GXColor){Theme.button_small_text_1, Theme.button_small_text_2, Theme.button_small_text_3, 255});
+    GuiButton bootmii(btn.GetWidth(), btn.GetHeight());
+    if(get_bootmii() == 3)
+        bootmii.SetLabel(&bootmiiTxtBoot2);
+    else
+        bootmii.SetLabel(&bootmiiTxtIOS);
+    bootmii.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
+    bootmii.SetPosition(0, 75);
+    bootmii.SetImage(&bootmiiImg);
+    bootmii.SetImageOver(&bootmiiImgOver);
+    bootmii.SetTrigger(&trigA);
 
 	GuiText hbfTxt(tr("Restart HBF"), 22, (GXColor){Theme.button_small_text_1, Theme.button_small_text_2, Theme.button_small_text_3, 255});
 	GuiButton hbf(btn.GetWidth(), btn.GetHeight());
@@ -124,10 +127,6 @@ endPrompt()
 
 		if(bootmii.GetState() == STATE_CLICKED)
 		{
-			if(get_bootmii() == 3)
-				set_bootmii(4);
-			else
-				set_bootmii(2);
 			menu = MENU_EXIT;
 			stop = true;
 		}
diff --git a/main/source/main.cpp b/main/source/main.cpp
index d5ae127..1aa0a48 100644
--- a/main/source/main.cpp
+++ b/main/source/main.cpp
@@ -149,7 +149,6 @@ DefaultSettings()
 	Settings.last_app_pos		= -1;
 	Settings.checkrev			= -1;
 	sprintf (Settings.code, "NULL");
-
 	Settings.Apps_from			= EFFECT_SLIDE_TOP;	// Apps kommen von "EFFECT_SLIDE_TOP", "EFFECT_SLIDE_BOTTOM", "EFFECT_SLIDE_RIGHT", "EFFECT_SLIDE_LEFT"
 	Settings.Apps_to			= 0;				// Apps geht nach "EFFECT_SLIDE_TOP", "EFFECT_SLIDE_BOTTOM", "EFFECT_SLIDE_RIGHT", "EFFECT_SLIDE_LEFT"
 	Settings.grid				= false;
@@ -277,9 +276,14 @@ main(int argc, char *argv[])
 		BootHomebrew();
 	}
 
-	if(get_bootmii() == 2)
+	if(get_bootmii() != 0)
 	{
-		if(!check_uneek_fs())
+        if(Options.bootmii_boot2)
+        {
+            xprintf("Load BootMii (Boot2)\n");
+            SYS_ResetSystem(SYS_RESTART, 0, 0);
+        }
+		else if(!check_uneek_fs())
 		{
 			xprintf("Load BootMii (IOS)\n");
 			IOS_ReloadIOS(254);
@@ -293,12 +297,6 @@ main(int argc, char *argv[])
 		}
 	}
 
-	if(get_bootmii() == 4)
-	{
-		xprintf("Load BootMii (Boot2)\n");
-		SYS_ResetSystem(SYS_RESTART, 0, 0);
-	}
-
 	if(get_nandemu() == 2)
 	{
 		if (opendir(check_path("sd1:/apps/NANDEmu-Boot").c_str()) != NULL)