diff --git a/app/Http/Middleware/Internationalization.php b/app/Http/Middleware/Internationalization.php
index f8d28804..c0322719 100644
--- a/app/Http/Middleware/Internationalization.php
+++ b/app/Http/Middleware/Internationalization.php
@@ -16,9 +16,11 @@ class Internationalization
             session(['locale' => Cookie::get('locale')]);
         }
 
-        if (Session::has('locale') && Arr::exists(config('locales'), session('locale'))) {
+        if (Session::has('locale')) {
             // Set app locale dynamically
             App::setLocale(session('locale'));
+        } else {
+            App::setLocale($request->getPreferredLanguage());
         }
 
         return $next($request);
diff --git a/config/app.php b/config/app.php
index e43cc2fa..7bd101ef 100644
--- a/config/app.php
+++ b/config/app.php
@@ -74,7 +74,7 @@ return [
     |
     */
 
-    'locale' => 'zh-CN',
+    'locale' => 'zh_CN',
 
     /*
     |--------------------------------------------------------------------------
diff --git a/config/locales.php b/config/locales.php
index 64c15eff..634ac01d 100644
--- a/config/locales.php
+++ b/config/locales.php
@@ -9,6 +9,6 @@ return [
     | Available Languages
     |
     */
-    'zh-CN' => '简体中文',
+    'zh_CN' => '简体中文',
     'en'    => 'English'
 ];
diff --git a/resources/lang/zh-CN/auth.yml b/resources/lang/zh_CN/auth.yml
similarity index 100%
rename from resources/lang/zh-CN/auth.yml
rename to resources/lang/zh_CN/auth.yml
diff --git a/resources/lang/zh-CN/errors.yml b/resources/lang/zh_CN/errors.yml
similarity index 100%
rename from resources/lang/zh-CN/errors.yml
rename to resources/lang/zh_CN/errors.yml
diff --git a/resources/lang/zh-CN/general.yml b/resources/lang/zh_CN/general.yml
similarity index 100%
rename from resources/lang/zh-CN/general.yml
rename to resources/lang/zh_CN/general.yml
diff --git a/resources/lang/zh-CN/index.yml b/resources/lang/zh_CN/index.yml
similarity index 100%
rename from resources/lang/zh-CN/index.yml
rename to resources/lang/zh_CN/index.yml
diff --git a/resources/lang/zh-CN/locale.js b/resources/lang/zh_CN/locale.js
similarity index 100%
rename from resources/lang/zh-CN/locale.js
rename to resources/lang/zh_CN/locale.js
diff --git a/resources/lang/zh-CN/setup.yml b/resources/lang/zh_CN/setup.yml
similarity index 100%
rename from resources/lang/zh-CN/setup.yml
rename to resources/lang/zh_CN/setup.yml
diff --git a/resources/lang/zh-CN/skinlib.yml b/resources/lang/zh_CN/skinlib.yml
similarity index 100%
rename from resources/lang/zh-CN/skinlib.yml
rename to resources/lang/zh_CN/skinlib.yml
diff --git a/resources/lang/zh-CN/user.yml b/resources/lang/zh_CN/user.yml
similarity index 100%
rename from resources/lang/zh-CN/user.yml
rename to resources/lang/zh_CN/user.yml
diff --git a/resources/lang/zh-CN/validation.yml b/resources/lang/zh_CN/validation.yml
similarity index 100%
rename from resources/lang/zh-CN/validation.yml
rename to resources/lang/zh_CN/validation.yml