diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php
index 2ea8dff0..56a23153 100644
--- a/app/Http/Controllers/SetupController.php
+++ b/app/Http/Controllers/SetupController.php
@@ -62,9 +62,22 @@ class SetupController extends Controller
             $this->keyGenerate();
         }
 
+        $supportedLanguages = Request::getLanguages();
+        $userLanguage = Config::get('app.locale');
+
+        foreach ($supportedLanguages as $language) {
+            $language = str_replace('_', '-', $language);
+
+            if (isset($this->langs[$language])) {
+                $userLanguage = $language;
+                break;
+            }
+        }
+
         return View::make('setup')
             ->withPageTitle(trans('setup.setup'))
             ->withCacheDrivers($this->cacheDrivers)
+            ->withUserLanguage($userLanguage)
             ->withAppUrl(Request::root());
     }
 
diff --git a/resources/views/setup.blade.php b/resources/views/setup.blade.php
index 2c584937..c2078970 100644
--- a/resources/views/setup.blade.php
+++ b/resources/views/setup.blade.php
@@ -101,7 +101,7 @@
                             <select name="settings[app_locale]" class="form-control" required>
                                 <option value="">Select Language</option>
                                 @foreach($langs as $lang => $name)
-                                <option value="{{ $lang }}" @if(Input::old('settings.app_locale') == $lang) selected @endif>
+                                <option value="{{ $lang }}" @if(Input::old('settings.app_locale') == $lang || $user_language == $lang) selected @endif>
                                     {{ $name }}
                                 </option>
                                 @endforeach