diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 2907de685..9a8ef07a1 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -31,7 +31,7 @@ class RegisterController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = '/home';
+    protected $redirectTo = '/';
 
     /**
      * Create a new controller instance.
diff --git a/app/Listeners/AuthLogin.php b/app/Listeners/AuthLogin.php
index e8a274e06..f587c66a7 100644
--- a/app/Listeners/AuthLogin.php
+++ b/app/Listeners/AuthLogin.php
@@ -2,6 +2,7 @@
 
 namespace App\Listeners;
 
+use DB;
 use App\User;
 use App\UserSetting;
 use Illuminate\Queue\InteractsWithQueue;
@@ -29,9 +30,11 @@ class AuthLogin
     {
         $user = $event->user;
         if (empty($user->settings)) {
-            $settings = new UserSetting();
-            $settings->user_id = $user->id;
-            $settings->save();
+            DB::transaction(function() use($user) {
+                UserSetting::firstOrCreate([
+                    'user_id' => $user->id
+                ]);
+            });
         }
     }
 }