diff --git a/app/Actions/Fortify/CreateNewUser.php b/app/Actions/Fortify/CreateNewUser.php
index ea2befd3a..9f97dd0d4 100644
--- a/app/Actions/Fortify/CreateNewUser.php
+++ b/app/Actions/Fortify/CreateNewUser.php
@@ -40,7 +40,7 @@ class CreateNewUser implements CreatesNewUsers
             $user = User::create([
                 'id' => 0,
                 'name' => $input['name'],
-                'email' => strtolower($input['email']),
+                'email' => $input['email'],
                 'password' => Hash::make($input['password']),
             ]);
             $team = $user->teams()->first();
@@ -52,7 +52,7 @@ class CreateNewUser implements CreatesNewUsers
         } else {
             $user = User::create([
                 'name' => $input['name'],
-                'email' => strtolower($input['email']),
+                'email' => $input['email'],
                 'password' => Hash::make($input['password']),
             ]);
             $team = $user->teams()->first();
diff --git a/app/Livewire/Profile/Index.php b/app/Livewire/Profile/Index.php
index a6b4dbe9e..4a419a12f 100644
--- a/app/Livewire/Profile/Index.php
+++ b/app/Livewire/Profile/Index.php
@@ -78,6 +78,8 @@ class Index extends Component
                 'new_email' => ['required', 'email', 'unique:users,email'],
             ]);
 
+            $this->new_email = strtolower($this->new_email);
+
             // Skip rate limiting in development mode
             if (! isDev()) {
                 // Rate limit by current user's email (1 request per 2 minutes)
@@ -90,7 +92,7 @@ class Index extends Component
                 }
 
                 // Rate limit by new email address (3 requests per hour per email)
-                $newEmailKey = 'email-change:email:'.md5(strtolower($this->new_email));
+                $newEmailKey = 'email-change:email:'.md5($this->new_email);
                 if (! RateLimiter::attempt($newEmailKey, 3, function () {}, 3600)) {
                     $this->dispatch('error', 'This email address has received too many verification requests. Please try again later.');
 
diff --git a/app/Models/User.php b/app/Models/User.php
index 48651d292..9ab9fefe9 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -56,6 +56,22 @@ class User extends Authenticatable implements SendsEmail
         'email_change_code_expires_at' => 'datetime',
     ];
 
+    /**
+     * Set the email attribute to lowercase.
+     */
+    public function setEmailAttribute($value)
+    {
+        $this->attributes['email'] = strtolower($value);
+    }
+
+    /**
+     * Set the pending_email attribute to lowercase.
+     */
+    public function setPendingEmailAttribute($value)
+    {
+        $this->attributes['pending_email'] = $value ? strtolower($value) : null;
+    }
+
     protected static function boot()
     {
         parent::boot();