diff --git a/app/Models/Auth/User.php b/app/Models/Auth/User.php
index 8905b35a9..819e7f5b7 100644
--- a/app/Models/Auth/User.php
+++ b/app/Models/Auth/User.php
@@ -176,7 +176,7 @@ class User extends Authenticatable implements HasLocalePreference
      */
     public function sendPasswordResetNotification($token)
     {
-        $this->notify(new Reset($token));
+        $this->notify(new Reset($token, $this->email));
     }
 
     /**
diff --git a/app/Notifications/Auth/Reset.php b/app/Notifications/Auth/Reset.php
index 1cc18d33d..b7c454d21 100644
--- a/app/Notifications/Auth/Reset.php
+++ b/app/Notifications/Auth/Reset.php
@@ -19,9 +19,10 @@ class Reset extends Notification
      *
      * @param  string  $token
      */
-    public function __construct($token)
+    public function __construct($token, $email)
     {
         $this->token = $token;
+        $this->email = $email;
     }
 
     /**
@@ -45,7 +46,7 @@ class Reset extends Notification
     {
         return (new MailMessage)
             ->line(trans('auth.notification.message_1'))
-            ->action(trans('auth.notification.button'), route('reset', $this->token))
+            ->action(trans('auth.notification.button'), route('reset', ['token' => $this->token, 'email' => $this->email]))
             ->line(trans('auth.notification.message_2'));
     }
 }
diff --git a/resources/views/auth/reset/create.blade.php b/resources/views/auth/reset/create.blade.php
index c48fefa93..ded044ad2 100644
--- a/resources/views/auth/reset/create.blade.php
+++ b/resources/views/auth/reset/create.blade.php
@@ -30,8 +30,9 @@
 
                 <x-form.group.email
                     name="email"
+                    :value="$email"
+                    :disabled="! is_null($email) ? true : false"
                     label="{{ trans('general.email') }}"
-                    placeholder="{{ trans('general.email') }}"
                     form-group-class="sm:col-span-6"
                     input-group-class="input-group-alternative"
                 />
diff --git a/resources/views/components/form/group/email.blade.php b/resources/views/components/form/group/email.blade.php
index 4028786cc..d84b0a167 100644
--- a/resources/views/components/form/group/email.blade.php
+++ b/resources/views/components/form/group/email.blade.php
@@ -43,6 +43,7 @@
                 name="{{ $name }}"
                 id="{{ $id }}"
                 value="{{ $value }}"
+                disabled="{{ $disabled }}"
                 placeholder="{{ $placeholder }}"
                 v-model="{{ !empty($attributes['v-model']) ? $attributes['v-model'] : (!empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.' . $name : 'form.' . $name) }}"
                 {{ $attributes->merge($custom_attributes) }}