diff --git a/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java b/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java
index 2be9ea15..b39240b4 100644
--- a/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java
+++ b/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java
@@ -55,14 +55,17 @@ public class ViaFabricPlus {
         // Classic Stuff
         CustomClassicProtocolExtensions.create();
         ClassicProtocolCommands.create();
-        ClassiCubeAccountHandler.create();
+        ClassicItemSelectionScreen.create();
 
-        // Bedrock Stuff
+        // Account Handler
+        ClassiCubeAccountHandler.create();
         BedrockAccountHandler.create();
 
-        // Protocol Translator
+        // Fixes which requires to be loaded pre
         ChatLengthCalculation.create();
         FontCacheFix.init();
+
+        // Protocol Translator
         ProtocolHack.init();
 
         FinishMinecraftLoadCallback.EVENT.register(() -> {
@@ -70,9 +73,7 @@ public class ViaFabricPlus {
             settingsSystem.init();
             informationSystem.init();
 
-            // Stuff which requires Minecraft to be initialized
-            ClassicItemSelectionScreen.create();
-
+            // Mappings which requires Minecraft to be initialized
             PackFormatsMappings.load();
             ItemReleaseVersionMappings.create();
             ArmorPointsMappings.load();
diff --git a/src/main/java/de/florianmichael/viafabricplus/definition/bedrock/BedrockAccountHandler.java b/src/main/java/de/florianmichael/viafabricplus/definition/bedrock/BedrockAccountHandler.java
index 923ab260..6306aa87 100644
--- a/src/main/java/de/florianmichael/viafabricplus/definition/bedrock/BedrockAccountHandler.java
+++ b/src/main/java/de/florianmichael/viafabricplus/definition/bedrock/BedrockAccountHandler.java
@@ -59,7 +59,11 @@ public class BedrockAccountHandler extends FileSaver {
                 account = MinecraftAuth.Bedrock.Title.MC_CHAIN.refresh(httpClient, account);
             }
         } catch (Exception e) {
-            ViaFabricPlus.LOGGER.error("Failed to log into Bedrock account!", e);
+            if (System.getProperty("VFPDebug") != null) {
+                ViaFabricPlus.LOGGER.error("Failed to log into Bedrock account!", e);
+            } else {
+                ViaFabricPlus.LOGGER.error("Failed to log into Bedrock account! Use -DVFPDebug to show the log");
+            }
         }
     }
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/definition/c0_30/classicube/ClassiCubeAccountHandler.java b/src/main/java/de/florianmichael/viafabricplus/definition/c0_30/classicube/ClassiCubeAccountHandler.java
index 0aac066e..ff38f144 100644
--- a/src/main/java/de/florianmichael/viafabricplus/definition/c0_30/classicube/ClassiCubeAccountHandler.java
+++ b/src/main/java/de/florianmichael/viafabricplus/definition/c0_30/classicube/ClassiCubeAccountHandler.java
@@ -58,7 +58,11 @@ public class ClassiCubeAccountHandler extends FileSaver {
         try {
             account = ClassiCubeAccount.fromJson(object);
         } catch (Exception e) {
-            ViaFabricPlus.LOGGER.error("Failed to log into ClassiCube account!", e);
+            if (System.getProperty("VFPDebug") != null) {
+                ViaFabricPlus.LOGGER.error("Failed to log into ClassiCube account!", e);
+            } else {
+                ViaFabricPlus.LOGGER.error("Failed to log into ClassiCube account! Use -DVFPDebug to show the log");
+            }
         }
     }