diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
index a07a372f86..4303afa40a 100644
--- a/app/Http/Controllers/Auth/ResetPasswordController.php
+++ b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -54,4 +54,14 @@ class ResetPasswordController extends Controller
             return $this->traitSendResetResponse($response);
         }
     }
+
+    public function showResetForm(Request $request, $token = null)
+    {
+        $passwordReset = PasswordReset::whereToken($token)->first();
+        $email = $passwordReset ? $passwordReset->email : '';
+
+        return view('auth.passwords.reset')->with(
+            ['token' => $token, 'email' => $email]
+        );
+    }
 }
diff --git a/app/Http/Controllers/ClientAuth/ResetPasswordController.php b/app/Http/Controllers/ClientAuth/ResetPasswordController.php
index 511c10cfa9..a2b379a419 100644
--- a/app/Http/Controllers/ClientAuth/ResetPasswordController.php
+++ b/app/Http/Controllers/ClientAuth/ResetPasswordController.php
@@ -7,6 +7,7 @@ use Config;
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\ResetsPasswords;
 use Illuminate\Http\Request;
+use App\Models\PasswordReset;
 
 class ResetPasswordController extends Controller
 {
@@ -54,8 +55,11 @@ class ResetPasswordController extends Controller
 
     public function showResetForm(Request $request, $token = null)
     {
+        $passwordReset = PasswordReset::whereToken($token)->first();
+        $email = $passwordReset ? $passwordReset->email : '';
+
         return view('clientauth.passwords.reset')->with(
-            ['token' => $token]
+            ['token' => $token, 'email' => $email]
         );
     }
 
diff --git a/app/Models/PasswordReset.php b/app/Models/PasswordReset.php
new file mode 100644
index 0000000000..468c9901e7
--- /dev/null
+++ b/app/Models/PasswordReset.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Models;
+
+use Eloquent;
+
+/**
+ * Class Client.
+ */
+class PasswordReset extends Eloquent
+{
+
+}
diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php
index c6e7503815..8d9df7cb83 100644
--- a/resources/views/auth/passwords/reset.blade.php
+++ b/resources/views/auth/passwords/reset.blade.php
@@ -3,11 +3,16 @@
 @section('form')
 <div class="container">
 
-  {!! Former::open('/password/reset')->addClass('form-signin')->rules(array(
+  {!! Former::open('/password/reset')
+        ->addClass('form-signin')
+        ->autocomplete('off')
+        ->rules(array(
         'password' => 'required',
         'password_confirmation' => 'required',
   )) !!}
 
+    @include('partials.autocomplete_fix')
+
     <h2 class="form-signin-heading">{{ trans('texts.set_password') }}</h2>
     <hr class="green">
 
@@ -35,9 +40,9 @@
     <input type="hidden" name="token" value="{{{ $token }}}">
 
     <div>
-        {!! Former::text('email')->placeholder(trans('texts.email'))->raw() !!}
-        {!! Former::password('password')->placeholder(trans('texts.password'))->raw() !!}
-        {!! Former::password('password_confirmation')->placeholder(trans('texts.confirm_password'))->raw() !!}
+        {!! Former::text('email')->placeholder(trans('texts.password'))->value($email)->raw() !!}
+        {!! Former::password('password')->placeholder(trans('texts.password'))->autocomplete('new-password')->raw() !!}
+        {!! Former::password('password_confirmation')->placeholder(trans('texts.confirm_password'))->autocomplete('new-password')->raw() !!}
     </div>
 
     <p>{!! Button::success(trans('texts.save'))->large()->submit()->withAttributes(['class' => 'green'])->block() !!}</p>
diff --git a/resources/views/clientauth/passwords/reset.blade.php b/resources/views/clientauth/passwords/reset.blade.php
index 8261983a51..0c2a50005e 100644
--- a/resources/views/clientauth/passwords/reset.blade.php
+++ b/resources/views/clientauth/passwords/reset.blade.php
@@ -3,11 +3,16 @@
 @section('form')
     <div class="container">
 
-        {!! Former::open('/client/password/reset')->addClass('form-signin')->rules(array(
+        {!! Former::open('/client/password/reset')
+                ->addClass('form-signin')
+                ->autocomplete('false')
+                ->rules(array(
                 'password' => 'required',
                 'password_confirmation' => 'required',
         )) !!}
 
+        @include('partials.autocomplete_fix')
+
         <h2 class="form-signin-heading">{{ trans('texts.set_password') }}</h2>
         <hr class="green">
 
@@ -35,9 +40,9 @@
         <input type="hidden" name="token" value="{{{ $token }}}">
 
         <div>
-            {!! Former::text('email')->placeholder(trans('texts.email'))->raw() !!}
-            {!! Former::password('password')->placeholder(trans('texts.password'))->raw() !!}
-            {!! Former::password('password_confirmation')->placeholder(trans('texts.confirm_password'))->raw() !!}
+            {!! Former::text('email')->placeholder(trans('texts.password'))->value($email)->raw() !!}
+            {!! Former::password('password')->placeholder(trans('texts.password'))->autocomplete('new-password')->raw() !!}
+            {!! Former::password('password_confirmation')->placeholder(trans('texts.confirm_password'))->autocomplete('new-password')->raw() !!}
         </div>
 
         <p>{!! Button::success(trans('texts.save'))->large()->submit()->withAttributes(['class' => 'green'])->block() !!}</p>
diff --git a/resources/views/partials/autocomplete_fix.blade.php b/resources/views/partials/autocomplete_fix.blade.php
index ec3f8c5cdb..cc0f61d3f7 100644
--- a/resources/views/partials/autocomplete_fix.blade.php
+++ b/resources/views/partials/autocomplete_fix.blade.php
@@ -1,4 +1,4 @@
 <!-- http://stackoverflow.com/a/30873633/497368 -->
 <div style="display: none;">
     <input type="text" id="PreventChromeAutocomplete" name="PreventChromeAutocomplete" autocomplete="address-level4" />
-</div>
\ No newline at end of file
+</div>