diff --git a/resources/assets/src/sass/install.scss b/resources/assets/src/sass/install.scss
index 8bb2f157..2984d5ac 100644
--- a/resources/assets/src/sass/install.scss
+++ b/resources/assets/src/sass/install.scss
@@ -2,7 +2,7 @@
  * @Author: printempw
  * @Date:   2016-07-28 13:15:18
  * @Last Modified by:   printempw
- * @Last Modified time: 2016-11-18 15:12:18
+ * @Last Modified time: 2016-12-31 17:08:19
  */
 
 @import "style.scss";
@@ -76,6 +76,12 @@ p {
     }
 }
 
+#language-chooser {
+    float: right;
+    margin-top: 4px;
+    height: 24px;
+}
+
 .step {
     margin: 20px 0 15px;
     text-align: left;
diff --git a/resources/views/setup/wizard/finish.tpl b/resources/views/setup/wizard/finish.tpl
index 6895ed04..59f510dc 100644
--- a/resources/views/setup/wizard/finish.tpl
+++ b/resources/views/setup/wizard/finish.tpl
@@ -1,7 +1,10 @@
 @extends('setup.wizard.master')
 
 @section('content')
-<h1>{{ trans('setup.wizard.finish.title') }}</h1>
+<h1>{{ trans('setup.wizard.finish.title') }}
+@include('setup.wizard.language')
+</h1>
+
 <p>{{ trans('setup.wizard.finish.text') }}</p>
 
 <table class="form-table install-success">
diff --git a/resources/views/setup/wizard/info.tpl b/resources/views/setup/wizard/info.tpl
index 3415e6b2..087ae040 100644
--- a/resources/views/setup/wizard/info.tpl
+++ b/resources/views/setup/wizard/info.tpl
@@ -1,7 +1,10 @@
 @extends('setup.wizard.master')
 
 @section('content')
-<h1>{{ trans('setup.wizard.info.title') }}</h1>
+<h1>{{ trans('setup.wizard.info.title') }}
+@include('setup.wizard.language')
+</h1>
+
 <p>{{ trans('setup.wizard.info.text') }}</p>
 
 <form id="setup" method="post" action="{{ url('setup/finish') }}" novalidate="novalidate">
diff --git a/resources/views/setup/wizard/language.tpl b/resources/views/setup/wizard/language.tpl
new file mode 100644
index 00000000..b72a1a10
--- /dev/null
+++ b/resources/views/setup/wizard/language.tpl
@@ -0,0 +1,5 @@
+<select id="language-chooser" onchange="refreshWithLangPrefer()">
+    @foreach(config('locales') as $code => $langInfo)
+    <option value="{{ $code }}" {!! $code == config('app.locale') ? 'selected="selected"' : '' !!}>{{ $langInfo['short_name'] }} - {{ $langInfo['name'] }}</option>
+    @endforeach
+</select>
diff --git a/resources/views/setup/wizard/master.tpl b/resources/views/setup/wizard/master.tpl
index 4fffa1d8..67345c90 100644
--- a/resources/views/setup/wizard/master.tpl
+++ b/resources/views/setup/wizard/master.tpl
@@ -7,6 +7,7 @@
     <title>{{ trans('setup.wizard.master.title') }}</title>
     <link rel="shortcut icon" href="../resources/assets/images/favicon.ico">
     <link rel="stylesheet" type="text/css" href="../resources/assets/dist/css/install.css">
+    @yield('style')
 </head>
 
 <body class="container">
@@ -14,6 +15,19 @@
 
 @yield('content')
 
-</body>
+<script>
+    function refreshWithLangPrefer() {
+        var e = document.getElementById("language-chooser");
+        var lang = e.options[e.selectedIndex].value;
 
+        // set cookie
+        document.cookie = "locale=" + lang + "; path=/";
+
+        location.reload();
+    }
+</script>
+
+@yield('script')
+
+</body>
 </html>
diff --git a/resources/views/setup/wizard/welcome.tpl b/resources/views/setup/wizard/welcome.tpl
index 178aaa05..2b2b6363 100644
--- a/resources/views/setup/wizard/welcome.tpl
+++ b/resources/views/setup/wizard/welcome.tpl
@@ -1,7 +1,9 @@
 @extends('setup.wizard.master')
 
 @section('content')
-<h1>{{ trans('setup.wizard.welcome.title') }}</h1>
+<h1>{{ trans('setup.wizard.welcome.title') }}
+@include('setup.wizard.language')
+</h1>
 
 <p>{{ trans('setup.wizard.welcome.text', ['version' => config('app.version')]) }}</p>
 <p>{{ trans('setup.database.connection-success', ['server' => $server]) }}</p>
