diff --git a/database/seeders/DummyDataSeeder.php b/database/seeders/DummyDataSeeder.php
index 48924842..b348f216 100755
--- a/database/seeders/DummyDataSeeder.php
+++ b/database/seeders/DummyDataSeeder.php
@@ -11,6 +11,7 @@
 use Blumilk\Meetup\Core\Models\User;
 use Illuminate\Database\Seeder;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Hash;
 
 class DummyDataSeeder extends Seeder
 {
@@ -19,7 +20,7 @@ public function run(): void
         $user = User::factory([
             "name" => "Admin",
             "email" => "admin@example.com",
-            "password" => "password",
+            "password" => Hash::make("password"),
             "email_verified_at" => Carbon::createFromDate(2022, 01, 01),
         ])->create();
 
diff --git a/environment/dev/php/Dockerfile b/environment/dev/php/Dockerfile
index 2b8c0a18..653e369a 100644
--- a/environment/dev/php/Dockerfile
+++ b/environment/dev/php/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/blumilksoftware/php:8.1
+FROM ghcr.io/blumilksoftware/php:8.1.5
 
 ARG XDEBUG_VERSION=3.1.2
 ARG INSTALL_XDEBUG=false
diff --git a/resources/views/user/password/forgot-password.blade.php b/resources/views/user/password/forgot-password.blade.php
index 0b3aa339..7dd56f1f 100644
--- a/resources/views/user/password/forgot-password.blade.php
+++ b/resources/views/user/password/forgot-password.blade.php
@@ -10,7 +10,7 @@
             <div>
               <h1 class="text-xl">Forgot your password?</h1>
               <p class="text-gray-400 text-sm mt-1">
-                Please enter the email adress and we will send you
+                Please enter the email address and we will send you
                 instructions to reset your password
               </p>
             </div>
diff --git a/resources/views/user/password/reset-password.blade.php b/resources/views/user/password/reset-password.blade.php
index 75295a12..0443b312 100644
--- a/resources/views/user/password/reset-password.blade.php
+++ b/resources/views/user/password/reset-password.blade.php
@@ -10,6 +10,11 @@
             <div>
               <h1 class="text-xl">Reset Password</h1>
             </div>
+            @if (!empty($error))
+              <div class="relative text-red-500 -top-6 left-1/2 transform -translate-x-1/2">
+                {{ $error }}
+              </div>
+            @endif
             <div>
               <input type="string" id="token" hidden="hidden" name="token" value="{{ $token }}">
               <x-input-error for="token" />
@@ -19,8 +24,7 @@
                 Email
               </label>
               <div class="mt-1">
-                <input id="email" name="email" type="email" placeholder="example@example.com"
-                  value="{{ $_GET['email'] }}" required
+                <input id="email" name="email" type="email" placeholder="example@example.com" value="{{ $email }}" required
                   class="appearance-none block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm placeholder-gray-400 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm"
                   readonly="readonly" />
                 <x-input-error for="email" />
diff --git a/src/Exceptions/PasswordIsTheSameAsOldException.php b/src/Exceptions/PasswordIsTheSameAsOldException.php
new file mode 100644
index 00000000..e2ebd5d0
--- /dev/null
+++ b/src/Exceptions/PasswordIsTheSameAsOldException.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Blumilk\Meetup\Core\Exceptions;
+
+use Exception;
+
+class PasswordIsTheSameAsOldException extends Exception
+{
+    protected $message = "Password cannot be the same as old password";
+}
diff --git a/src/Http/Controllers/Auth/PasswordResetController.php b/src/Http/Controllers/Auth/PasswordResetController.php
index 5e72e633..4e81318f 100755
--- a/src/Http/Controllers/Auth/PasswordResetController.php
+++ b/src/Http/Controllers/Auth/PasswordResetController.php
@@ -4,6 +4,7 @@
 
 namespace Blumilk\Meetup\Core\Http\Controllers\Auth;
 
+use Blumilk\Meetup\Core\Exceptions\PasswordIsTheSameAsOldException;
 use Blumilk\Meetup\Core\Http\Controllers\Controller;
 use Blumilk\Meetup\Core\Http\Requests\PasswordReset\PasswordResetRequest;
 use Blumilk\Meetup\Core\Http\Requests\PasswordReset\PasswordUpdateRequest;
@@ -12,6 +13,7 @@
 use Illuminate\Contracts\Auth\PasswordBroker;
 use Illuminate\Contracts\Hashing\Hasher;
 use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
 use Illuminate\View\View;
 
 class PasswordResetController extends Controller
@@ -44,9 +46,14 @@ public function store(PasswordResetRequest $request): View|RedirectResponse
         return back()->withErrors(["email" => __($status)]);
     }
 
-    public function edit(PasswordResetRequest $request, string $token): View
+    public function edit(string $token, Request $request): View
     {
-        return view("user.password.reset-password")->with(["email" => $request->validated("email"), "token" => $token]);
+        $email = $request->email;
+
+        return view("user.password.reset-password")->with([
+            "token" => $token,
+            "email" => $email,
+        ]);
     }
 
     /**
@@ -54,6 +61,17 @@ public function edit(PasswordResetRequest $request, string $token): View
      */
     public function update(PasswordUpdateRequest $request, PasswordResetService $service): RedirectResponse|View
     {
+        try {
+            $service->validatePassword($request->get("password"), $request->get("email"));
+        } catch (PasswordIsTheSameAsOldException $exception) {
+            return view("user.password.reset-password")
+                ->with([
+                    "error" => $exception->getMessage(),
+                    "token" => $request->validated("token"),
+                    "email" => $request->validated("email"),
+                ]);
+        }
+
         $status = $service->resetPassword($request->validated());
 
         if ($status === PasswordBroker::PASSWORD_RESET) {
diff --git a/src/Http/Controllers/Auth/RegisterController.php b/src/Http/Controllers/Auth/RegisterController.php
index 1ba7a91a..2e180449 100644
--- a/src/Http/Controllers/Auth/RegisterController.php
+++ b/src/Http/Controllers/Auth/RegisterController.php
@@ -6,25 +6,24 @@
 
 use Blumilk\Meetup\Core\Http\Controllers\Controller;
 use Blumilk\Meetup\Core\Http\Requests\Authentication\RegisterUserRequest;
-use Blumilk\Meetup\Core\Models\User;
-use Illuminate\Auth\Events\Registered;
+use Blumilk\Meetup\Core\Services\UserRegisterService;
 use Illuminate\Contracts\View\View;
+use Illuminate\Http\Request;
 
 class RegisterController extends Controller
 {
-    public function create(): View
+    public function create(Request $request): View
     {
-        if (request()->has("email")) {
-            return view("user.register")->with("email", request()->get("email"));
+        if ($request->has("email")) {
+            return view("user.register")->with("email", $request->email);
         }
 
         return view("user.register")->with("email", old("email"));
     }
 
-    public function store(RegisterUserRequest $request): View
+    public function store(RegisterUserRequest $request, UserRegisterService $service): View
     {
-        $user = User::query()->create($request->validated());
-        event(new Registered($user));
+        $service->register($request->validated("email"), $request->validated("name"), $request->validated("password"));
 
         return view("user.registered");
     }
diff --git a/src/Observers/UserObserver.php b/src/Observers/UserObserver.php
deleted file mode 100644
index 67c5164c..00000000
--- a/src/Observers/UserObserver.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Blumilk\Meetup\Core\Observers;
-
-use Blumilk\Meetup\Core\Models\User;
-use Illuminate\Contracts\Hashing\Hasher;
-
-class UserObserver
-{
-    public function __construct(
-        protected Hasher $hasher,
-    ) {}
-
-    public function creating(User $user): void
-    {
-        $user->password = $this->hasher->make($user->password);
-    }
-}
diff --git a/src/Providers/EventServiceProvider.php b/src/Providers/EventServiceProvider.php
index b2f1880c..5865ecde 100755
--- a/src/Providers/EventServiceProvider.php
+++ b/src/Providers/EventServiceProvider.php
@@ -7,11 +7,9 @@
 use Blumilk\Meetup\Core\Models\Contact;
 use Blumilk\Meetup\Core\Models\Meetup;
 use Blumilk\Meetup\Core\Models\NewsletterSubscriber;
-use Blumilk\Meetup\Core\Models\User;
 use Blumilk\Meetup\Core\Observers\ContactObserver;
 use Blumilk\Meetup\Core\Observers\MeetupObserver;
 use Blumilk\Meetup\Core\Observers\NewsletterSubscriberObserver;
-use Blumilk\Meetup\Core\Observers\UserObserver;
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
@@ -26,7 +24,6 @@ class EventServiceProvider extends ServiceProvider
 
     public function boot(): void
     {
-        User::observe(UserObserver::class);
         Contact::observe(ContactObserver::class);
         Meetup::observe(MeetupObserver::class);
         NewsletterSubscriber::observe(NewsletterSubscriberObserver::class);
diff --git a/src/Services/Authentication/PasswordResetService.php b/src/Services/Authentication/PasswordResetService.php
index 8efded46..def32475 100644
--- a/src/Services/Authentication/PasswordResetService.php
+++ b/src/Services/Authentication/PasswordResetService.php
@@ -4,6 +4,8 @@
 
 namespace Blumilk\Meetup\Core\Services\Authentication;
 
+use Blumilk\Meetup\Core\Exceptions\PasswordIsTheSameAsOldException;
+use Blumilk\Meetup\Core\Models\User;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Auth\Passwords\PasswordBrokerManager;
 use Illuminate\Contracts\Hashing\Hasher;
@@ -16,6 +18,18 @@ public function __construct(
         protected Hasher $hash,
     ) {}
 
+    /**
+     * @throws PasswordIsTheSameAsOldException
+     */
+    public function validatePassword(string $password, string $email): void
+    {
+        $user = User::query()->where("email", $email)->first();
+
+        if ($this->hash->check($password, $user?->password)) {
+            throw new PasswordIsTheSameAsOldException();
+        }
+    }
+
     /**
      * @throws AuthenticationException
      */
diff --git a/src/Services/Authentication/UserLoginService.php b/src/Services/Authentication/UserLoginService.php
index 314fb49d..503f4741 100644
--- a/src/Services/Authentication/UserLoginService.php
+++ b/src/Services/Authentication/UserLoginService.php
@@ -24,9 +24,11 @@ public function __construct(
     public function loginUser(string $email, string $password): void
     {
         $user = User::where("email", $email)->first();
+
         if (!$this->hasher->check($password, $user?->password)) {
             throw new AuthenticationException("Bad credentials");
         }
+
         $this->authManager->login($user);
         $this->session->regenerate();
     }
diff --git a/src/Services/UserRegisterService.php b/src/Services/UserRegisterService.php
new file mode 100644
index 00000000..48bed917
--- /dev/null
+++ b/src/Services/UserRegisterService.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Blumilk\Meetup\Core\Services;
+
+use Blumilk\Meetup\Core\Models\User;
+use Illuminate\Auth\Events\Registered;
+use Illuminate\Contracts\Hashing\Hasher;
+
+class UserRegisterService
+{
+    public function __construct(
+        protected Hasher $hasher,
+    ) {}
+
+    public function register(string $email, string $name, string $password): void
+    {
+        $hashedPassword = $this->hasher->make($password);
+
+        $user = User::query()->firstOrCreate([
+            "email" => $email,
+            "name" => $name,
+            "password" => $hashedPassword,
+        ]);
+
+        event(new Registered($user));
+    }
+}