diff --git a/packages/Auth/SendsPasswordResetEmails.php b/packages/Auth/SendsPasswordResetEmails.php
index 83a4eb65..71aeaf02 100644
--- a/packages/Auth/SendsPasswordResetEmails.php
+++ b/packages/Auth/SendsPasswordResetEmails.php
@@ -22,7 +22,7 @@ trait SendsPasswordResetEmails
     public function sendDisposablePassword(Request $request)
     {
         $this->validatePhone($request);
-
+        
         // We will send the Disposable Password
         // to send the Disposable Password , we will examine the response then see the message we
         // need to show to the user. Finally, we'll send out a proper response.
@@ -38,15 +38,14 @@ trait SendsPasswordResetEmails
      */
      public function checkDisposablePassword(Request $request)
      {
-         if ( \Cache::has($request->code) ) {
-             $userid = \Cache::pull($request->code);
+        $userid = \Cache::pull($request->code);
+         if ( !is_null($userid) ) {
              $user = User::findOrFail($userid);
              if($user) {
-
                  $user->password = \Hash::make($request->code);
                  $user->save();
 
-                 $request->merge([ 'cell_number' => $user->cell_number ]);
+                 $request->merge([ 'cell_number' => $user->cell_number, 'password' => $request->code ]);
                  return (new LoginController())->login($request);
              }
              return MessageResponse::error('User Not Found');