diff --git a/resources/views/auth/login.twig b/resources/views/auth/login.twig
index 1257985a91..7390c87879 100644
--- a/resources/views/auth/login.twig
+++ b/resources/views/auth/login.twig
@@ -44,7 +44,7 @@
         {% if Config.get('auth.allow_register') %}
             <a href="{{ URL.to('/register') }}" class="text-center">Register a new account</a><br>
         {% endif %}
-        <a href="{{ URL.to('/password/email') }}">I forgot my password</a>
+        <a href="{{ URL.to('/password/reset') }}">I forgot my password</a>
     </div>
     <!-- /.login-box-body -->
 {% endblock %}
diff --git a/resources/views/auth/password.twig b/resources/views/auth/password.twig
index 366b0abda8..bce754d502 100644
--- a/resources/views/auth/password.twig
+++ b/resources/views/auth/password.twig
@@ -23,7 +23,7 @@
     <div class="login-box-body">
         <p class="login-box-msg">Reset your password</p>
 
-        <form role="form" method="POST" action="{{ URL.to('/password/email') }}">
+        <form role="form" method="POST" action="{{ URL.to('/password/reset') }}">
             <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
 
             <div class="form-group has-feedback">
@@ -41,7 +41,7 @@
         </form>
 
         <a href="{{ URL.to('/login') }}">I want to login</a><br>
-        <a href="{{ URL.to('/password/email') }}">I forgot my password</a>
+        <a href="{{ URL.to('/password/reset') }}">I forgot my password</a>
 
     </div><!-- /.login-box-body -->
 
diff --git a/resources/views/auth/register.twig b/resources/views/auth/register.twig
index 95a63ff5e5..4d7ab7394a 100644
--- a/resources/views/auth/register.twig
+++ b/resources/views/auth/register.twig
@@ -47,7 +47,7 @@
         </form>
 
         <a href="{{ URL.to('/login') }}">I want to login</a><br>
-        <a href="{{ URL.to('/password/email') }}">I forgot my password</a>
+        <a href="{{ URL.to('/password/reset') }}">I forgot my password</a>
     </div><!-- /.form-box -->
 
 {% endblock %}
diff --git a/resources/views/emails/registered-html.twig b/resources/views/emails/registered-html.twig
index 5c89c1a81d..11516a4c57 100644
--- a/resources/views/emails/registered-html.twig
+++ b/resources/views/emails/registered-html.twig
@@ -19,7 +19,7 @@
 <ul>
     <li style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
         If you have forgotten your password already, please reset it using
-        <a style="color:#337ab7" href="{{ address }}/password/email">the password reset tool</a>.
+        <a style="color:#337ab7" href="{{ address }}/password/reset">the password reset tool</a>.
     </li>
     <li style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
         There is a help-icon in the top right corner of each page. If you need help, click it!
diff --git a/resources/views/emails/registered.twig b/resources/views/emails/registered.twig
index 400ea17887..6ff499f117 100644
--- a/resources/views/emails/registered.twig
+++ b/resources/views/emails/registered.twig
@@ -12,7 +12,7 @@ Firefly III:
 {{ address }}
 
 Password reset:
-{{ address }}/password/email
+{{ address }}/password/reset
 
 Documentation:
 https://github.com/JC5/firefly-iii/wiki/First-use