diff --git a/app/templates/app/registration/login.html b/app/templates/app/registration/login.html
index a1b9b8d4..c19260f2 100644
--- a/app/templates/app/registration/login.html
+++ b/app/templates/app/registration/login.html
@@ -11,6 +11,7 @@
 
     {% is_single_user_mode as autologin %}
     {% has_external_auth as ext_auth %}
+    {% reset_password_link as reset_pwd_link %}
 
     {% if autologin %}
         <script>location.href='/';</script>
@@ -24,14 +25,17 @@
               <button type="submit" class="btn btn-default">{% trans 'Log in' %}</button>
             </div>
             <div class="top-buffer col-sm-offset-2 col-sm-10">
-              <!--<p><a href="{% url 'password_reset' %}">{% trans "Reset My Password" %}</a></p>-->
-                <p><a href="javascript:toggleForgotPasswordHint();">Forgot your password?</a></p>
+                {% if reset_pwd_link != '' %}
+                <p><a href="{{ reset_pwd_link }}">{% trans "Forgot your password?" %}</a></p>
+                {% else %}
+                <p><a href="javascript:toggleForgotPasswordHint();">{% trans "Forgot your password?" %}</a></p>
                 <script>function toggleForgotPasswordHint(){ $("#forgotPasswordHint").toggle(); }</script>
                 <div id="forgotPasswordHint" style="display: none; font-size: 90%; padding: 4px;" class="theme-secondary">
                     You can reset the administrator password by running the following command:
                     <span class="theme-background-highlight" style="padding: 4px; margin: 8px 0; display: inline-block;">./webodm.sh resetadminpassword yournewpass</span><br/>
                     If you used WebODM Manager to launch WebODM, find the "Reset Password" button within the maintenance panel or within one of WebODM Manager menus.
                 </div>
+                {% endif %}
             </div>
         </div>
     </form>
diff --git a/app/templatetags/settings.py b/app/templatetags/settings.py
index d904dd1e..96efd0e2 100644
--- a/app/templatetags/settings.py
+++ b/app/templatetags/settings.py
@@ -9,6 +9,10 @@ from django.utils.translation import gettext as _
 register = template.Library()
 logger = logging.getLogger('app.logger')
 
+@register.simple_tag
+def reset_password_link():
+    return settings.RESET_PASSWORD_LINK
+
 @register.simple_tag
 def has_external_auth():
     return settings.EXTERNAL_AUTH_ENDPOINT != ""