From 414038a2cf8b61332be07e5de6db5c78a92c81f7 Mon Sep 17 00:00:00 2001
From: DariusIII <dkrisan@gmail.com>
Date: Thu, 31 May 2018 10:36:06 +0200
Subject: [PATCH] Fix password reset

---
 Changelog                                              | 1 +
 app/Http/Controllers/Auth/ForgotPasswordController.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog b/Changelog
index c702d2e7a..4f67e7420 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2018-05-31 DariusIII
+	* Fix: Fix password reset
 	* Chg: Use now() helper in place of Carbon::now()
 	* Chg: Users can be logged in on 1 device at a time
 2018-05-30 DariusIII
diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php
index 09028a0fd..592b18540 100644
--- a/app/Http/Controllers/Auth/ForgotPasswordController.php
+++ b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -64,7 +64,7 @@ class ForgotPasswordController extends Controller
             //
             // Send the email
             //
-            $resetLink = $request->server('SERVER_NAME').'/forgottenpassword?action=reset&guid='.$guid;
+            $resetLink = $request->server('SERVER_NAME').'/resetpassword?guid='.$guid;
             Mail::to($ret['email'])->send(new ForgottenPassword($resetLink));
             $sent = true;
         }