diff --git a/source/firm.c b/source/firm.c
index 18f7097..2447e02 100755
--- a/source/firm.c
+++ b/source/firm.c
@@ -75,10 +75,10 @@ void main(void)
     //Determine if this is a firmlaunch boot
     if(launchedFirmTidLow[5] != 0)
     {
-        if(needConfig == CREATE_CONFIGURATION) mcuReboot();
-
         isFirmlaunch = true;
 
+        if(needConfig == CREATE_CONFIGURATION) mcuReboot();
+
         //'0' = NATIVE_FIRM, '1' = TWL_FIRM, '2' = AGB_FIRM
         firmType = launchedFirmTidLow[7] == u'3' ? SAFE_FIRM : (FirmwareType)(launchedFirmTidLow[5] - u'0');
 
@@ -238,9 +238,9 @@ static inline u32 loadFirm(FirmwareType *firmType, FirmwareSource firmSource)
 
     if(!isN3DS && *firmType == NATIVE_FIRM)
     {
-        //We can't boot < 3.x EmuNANDs
         if(firmVersion < 0x18)
         {
+            //We can't boot < 3.x EmuNANDs
             if(firmSource != FIRMWARE_SYSNAND) 
                 error("An old unsupported EmuNAND has been detected.\nLuma3DS is unable to boot it");