diff --git a/ckan/controllers/user.py b/ckan/controllers/user.py
index 741cbea5d93..b789eb23a16 100644
--- a/ckan/controllers/user.py
+++ b/ckan/controllers/user.py
@@ -264,6 +264,7 @@ def login(self):
             g.openid_enabled = False
 
         if not c.user:
+            c.login_handler = h.url_for(self._get_repoze_handler('login_handler_path'))
             return render('user/login.html')
         else:
             return render('user/logout_first.html')
diff --git a/ckan/templates/user/login.html b/ckan/templates/user/login.html
index 9d4c365473e..1b2e86bf481 100644
--- a/ckan/templates/user/login.html
+++ b/ckan/templates/user/login.html
@@ -22,7 +22,7 @@
 
   <div py:match="content">
 
-    <form action="${h.url_for('/login_generic')}" method="post" class="form-horizontal" id="login">  
+    <form action="${c.login_handler}" method="post" class="form-horizontal" id="login">  
       <fieldset>
         <!--legend i18n:msg="site_title">Login</legend-->
         <div class="control-group">