diff --git a/cms/djangoapps/contentstore/views/public.py b/cms/djangoapps/contentstore/views/public.py
index fafd563c78..de0a1899b3 100644
--- a/cms/djangoapps/contentstore/views/public.py
+++ b/cms/djangoapps/contentstore/views/public.py
@@ -38,7 +38,7 @@ def login_page(request):
     csrf_token = csrf(request)['csrf_token']
     return render_to_response('login.html', {
         'csrf': csrf_token,
-        'forgot_password_link': "//{base}/#forgot-password-modal".format(base=settings.LMS_BASE),
+        'forgot_password_link': "//{base}/login#forgot-password-modal".format(base=settings.LMS_BASE),
     })
 
 
diff --git a/lms/templates/login.html b/lms/templates/login.html
index 80dab49365..56a04d6283 100644
--- a/lms/templates/login.html
+++ b/lms/templates/login.html
@@ -16,6 +16,11 @@
       // adding js class for styling with accessibility in mind
       $('body').addClass('js').addClass(view_name);
 
+      // show forgot password modal UI if URL contains matching DOM ID
+      if ($.deparam.fragment()['forgot-password-modal'] !== undefined) {
+        $('.pwd-reset').click();
+      }
+
       // new window/tab opening
       $('a[rel="external"], a[class="new-vp"]')
       .click( function() {