diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php
index 2cb1e8041b87..7d08aad6a391 100644
--- a/app/Http/Controllers/Auth/ForgotPasswordController.php
+++ b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -11,12 +11,13 @@
 
 namespace App\Http\Controllers\Auth;
 
-use App\Http\Controllers\Controller;
-use App\Libraries\MultiDB;
 use App\Models\Account;
-use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
+use App\Models\Company;
+use App\Libraries\MultiDB;
 use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Password;
+use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
 
 class ForgotPasswordController extends Controller
 {
diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
index 75436ed0325b..09419ac60f67 100644
--- a/app/Http/Controllers/Auth/ResetPasswordController.php
+++ b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -69,7 +69,7 @@ class ResetPasswordController extends Controller
             $account = Account::first();
         }
 
-        return $this->render('auth.passwords.reset', ['root' => 'themes', 'token' => $token, 'account' => $account]);
+        return $this->render('auth.passwords.reset', ['root' => 'themes', 'token' => $token, 'account' => $account, 'email' => $request->email]);
     }
 
     /**
@@ -111,4 +111,28 @@ class ResetPasswordController extends Controller
 
         return redirect('/');
     }
+
+    /**
+     * Get the response for a successful password reset.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  string  $response
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
+     */
+    protected function sendResetResponse(Request $request, $response)
+    {
+        if ($request->wantsJson()) {
+            return new JsonResponse(['message' => trans($response)], 200);
+        }
+
+        if(Ninja::isHosted() &&  $request->hasHeader('X-React')){
+            return redirect('https://app.invoicing.co/#/login');
+        }
+        elseif($request->hasHeader('X-React'))
+            return redirect('/#/login');    
+
+        return redirect($this->redirectPath())
+                            ->with('status', trans($response));
+    }
+
 }
diff --git a/app/Http/Middleware/Cors.php b/app/Http/Middleware/Cors.php
index 869157ea686e..82926e3ddb50 100644
--- a/app/Http/Middleware/Cors.php
+++ b/app/Http/Middleware/Cors.php
@@ -15,7 +15,7 @@ class Cors
             // ALLOW OPTIONS METHOD
             $headers = [
                 'Access-Control-Allow-Methods'=> 'POST, GET, OPTIONS, PUT, DELETE',
-                'Access-Control-Allow-Headers'=> 'X-API-PASSWORD-BASE64,X-API-COMPANY-KEY,X-CLIENT-VERSION,X-API-SECRET,X-API-TOKEN,X-API-PASSWORD,DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Disposition,Range,X-CSRF-TOKEN,X-XSRF-TOKEN,X-LIVEWIRE',
+                'Access-Control-Allow-Headers'=> 'X-React,X-API-PASSWORD-BASE64,X-API-COMPANY-KEY,X-CLIENT-VERSION,X-API-SECRET,X-API-TOKEN,X-API-PASSWORD,DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Disposition,Range,X-CSRF-TOKEN,X-XSRF-TOKEN,X-LIVEWIRE',
             ];
 
             return Response::make('OK', 200, $headers);
@@ -25,7 +25,7 @@ class Cors
 
         $response->headers->set('Access-Control-Allow-Origin', '*');
         $response->headers->set('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS');
-        $response->headers->set('Access-Control-Allow-Headers', 'X-API-PASSWORD-BASE64,X-API-COMPANY-KEY,X-API-SECRET,X-API-TOKEN,X-API-PASSWORD,DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Disposition,Range,X-CSRF-TOKEN,X-XSRF-TOKEN,X-LIVEWIRE');
+        $response->headers->set('Access-Control-Allow-Headers', 'X-React,X-API-PASSWORD-BASE64,X-API-COMPANY-KEY,X-API-SECRET,X-API-TOKEN,X-API-PASSWORD,DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Disposition,Range,X-CSRF-TOKEN,X-XSRF-TOKEN,X-LIVEWIRE');
         $response->headers->set('Access-Control-Expose-Headers', 'X-APP-VERSION,X-MINIMUM-CLIENT-VERSION,Content-Disposition');
         $response->headers->set('X-APP-VERSION', config('ninja.app_version'));
         $response->headers->set('X-MINIMUM-CLIENT-VERSION', config('ninja.minimum_client_version'));
diff --git a/resources/views/portal/ninja2020/auth/passwords/reset.blade.php b/resources/views/portal/ninja2020/auth/passwords/reset.blade.php
index 3ace5553f017..28e36f4b7ce1 100644
--- a/resources/views/portal/ninja2020/auth/passwords/reset.blade.php
+++ b/resources/views/portal/ninja2020/auth/passwords/reset.blade.php
@@ -41,7 +41,7 @@
                             <input type="email" name="email" id="email"
                                    class="input"
                                    value="{{ $email ?? old('email') }}"
-                                   autofocus>
+                                   >
                             @error('email')
                             <div class="validation validation-fail">
                                 {{ $message }}
@@ -63,7 +63,7 @@
                             <label for="password" class="input-label">{{ ctrans('texts.password') }}</label>
                             <input type="password" name="password_confirmation" id="password_confirmation"
                                    class="input"
-                                   autofocus>
+                                   >
                             @error('password_confirmation')
                             <div class="validation validation-fail">
                                 {{ $message }}