diff --git a/app/src/main/java/net/kdt/pojavlaunch/DisplayableLocale.java b/app/src/main/java/net/kdt/pojavlaunch/DisplayableLocale.java
index 66a6372d1..e5b8b38fa 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/DisplayableLocale.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/DisplayableLocale.java
@@ -8,7 +8,7 @@ public class DisplayableLocale {
     private static Locale processStringLocale(String locale) {
         if (locale.contains("-")) {
             String[] split = locale.split("-");
-            return new Locale(split[0], split[1]);
+            return new Locale(split[0] /*, split[1] */);
         } else {
             return new Locale(locale);
         }
diff --git a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
index ed0028b69..7aec1f581 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
@@ -45,7 +45,7 @@ public class PojavLoginActivity extends BaseActivity
     
     private SharedPreferences firstLaunchPrefs;
     
-    private boolean isSkipInit = false;
+    private static boolean isSkipInit = false;
     
     // private final String PREF_IS_DONOTSHOWAGAIN_WARN = "isWarnDoNotShowAgain";
     public static final String PREF_IS_INSTALLED_JAVARUNTIME = "isJavaRuntimeInstalled";
@@ -69,8 +69,6 @@ public class PojavLoginActivity extends BaseActivity
         
         firstLaunchPrefs = getSharedPreferences("pojav_extract", MODE_PRIVATE);
         new InitTask().execute(isSkipInit);
-        
-        isSkipInit = true;
     }
 
     private class InitTask extends AsyncTask<Boolean, String, Integer>{
@@ -280,6 +278,8 @@ public class PojavLoginActivity extends BaseActivity
                     edit3.setEnabled(!p2);
                 }
             });
+            
+        isSkipInit = true;
     }
     
     @Override
diff --git a/app/src/main/java/net/kdt/pojavlaunch/utils/LocaleUtils.java b/app/src/main/java/net/kdt/pojavlaunch/utils/LocaleUtils.java
index 302b366a8..435a455fc 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/utils/LocaleUtils.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/utils/LocaleUtils.java
@@ -19,11 +19,13 @@ public class LocaleUtils {
 			LauncherPreferences.loadPreferences();
         }
         
+        Locale locale;
         if (LauncherPreferences.PREF_LANGUAGE.equals("default")) {
-            return context;
+            locale = DEFAULT_LOCALE;
+        } else {
+            locale = new Locale(LauncherPreferences.PREF_LANGUAGE);
         }
         
-        Locale locale = new Locale(LauncherPreferences.PREF_LANGUAGE);
         Locale.setDefault(locale);
 
         Resources res = context.getResources();