diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php
index 6a809d07..c124c3f0 100644
--- a/app/Http/Controllers/SetupController.php
+++ b/app/Http/Controllers/SetupController.php
@@ -15,6 +15,15 @@ use App\Exceptions\PrettyPageException;
 
 class SetupController extends Controller
 {
+    public function __construct(Request $request)
+    {
+        if ($locale = $request->input('lang')) {
+            cookie()->queue('locale', $locale);
+            session(['locale' => $locale]);
+            app()->setLocale($locale);
+        }
+    }
+
     public function welcome()
     {
         // already installed
diff --git a/resources/views/setup/wizard/master.tpl b/resources/views/setup/wizard/master.tpl
index 67345c90..b15205f6 100644
--- a/resources/views/setup/wizard/master.tpl
+++ b/resources/views/setup/wizard/master.tpl
@@ -20,10 +20,7 @@
         var e = document.getElementById("language-chooser");
         var lang = e.options[e.selectedIndex].value;
 
-        // set cookie
-        document.cookie = "locale=" + lang + "; path=/";
-
-        location.reload();
+        window.location = "?lang="+lang;
     }
 </script>