diff --git a/app/Eloquent/Observers/UserObserver.php b/app/Eloquent/Observers/UserObserver.php
index 6921550..c69f790 100644
--- a/app/Eloquent/Observers/UserObserver.php
+++ b/app/Eloquent/Observers/UserObserver.php
@@ -4,11 +4,18 @@ declare(strict_types=1);
 
 namespace Toby\Eloquent\Observers;
 
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Str;
 use Toby\Eloquent\Models\User;
 use Toby\Eloquent\Models\YearPeriod;
 
 class UserObserver
 {
+    public function creating(User $user): void
+    {
+        $user->password = Hash::make(Str::random(40));
+    }
+
     public function created(User $user): void
     {
         $yearPeriods = YearPeriod::all();
diff --git a/app/Infrastructure/Http/Controllers/GoogleController.php b/app/Infrastructure/Http/Controllers/GoogleController.php
index 65c8395..a24a956 100644
--- a/app/Infrastructure/Http/Controllers/GoogleController.php
+++ b/app/Infrastructure/Http/Controllers/GoogleController.php
@@ -7,7 +7,6 @@ namespace Toby\Infrastructure\Http\Controllers;
 use Illuminate\Contracts\Auth\Factory as AuthFactory;
 use Illuminate\Contracts\Hashing\Hasher;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Illuminate\Support\Str;
 use Laravel\Socialite\SocialiteManager;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Toby\Eloquent\Models\User;
@@ -36,9 +35,6 @@ class GoogleController extends Controller
                 ]);
         }
 
-        $user->update([
-            "password" => $hash->make(Str::random(40)),
-        ]);
         $auth->guard()->login($user, true);
 
         return redirect()->route("dashboard");
diff --git a/app/Infrastructure/Http/Controllers/LogoutController.php b/app/Infrastructure/Http/Controllers/LogoutController.php
index 937c2f9..581b4a6 100644
--- a/app/Infrastructure/Http/Controllers/LogoutController.php
+++ b/app/Infrastructure/Http/Controllers/LogoutController.php
@@ -12,10 +12,6 @@ class LogoutController extends Controller
 {
     public function __invoke(Request $request): RedirectResponse
     {
-        $request->user()->update([
-            "password" => null,
-        ]);
-
         Auth::logout();
 
         $request->session()->invalidate();