diff --git a/core/src/main/java/hudson/security/LegacySecurityRealm.java b/core/src/main/java/hudson/security/LegacySecurityRealm.java
index e618ad2e0dfc2f7b9acef8543f05a223e720e744..d33f52bee7461666187d044f88b4c4736ee26c65 100644
--- a/core/src/main/java/hudson/security/LegacySecurityRealm.java
+++ b/core/src/main/java/hudson/security/LegacySecurityRealm.java
@@ -28,7 +28,7 @@ public final class LegacySecurityRealm extends SecurityRealm implements Authenti
      * submit the form to the URL defined by the servlet spec.
      */
     @Override
-    public String getLoginUrl() {
+    public String getAuthenticationGatewayUrl() {
         return "j_security_check";
     }
 
diff --git a/core/src/main/java/hudson/security/SecurityRealm.java b/core/src/main/java/hudson/security/SecurityRealm.java
index 962da6b0250723fb4ddca0411d9efb98bf6484cd..362304d0bef6cb72fce088daff7001ccdfba97a0 100644
--- a/core/src/main/java/hudson/security/SecurityRealm.java
+++ b/core/src/main/java/hudson/security/SecurityRealm.java
@@ -57,7 +57,7 @@ public abstract class SecurityRealm implements Describable<SecurityRealm>, Exten
      * Returns the URL to submit a form for the authentication.
      * There's no need to override this, except for {@link LegacySecurityRealm}.
      */
-    public String getLoginUrl() {
+    public String getAuthenticationGatewayUrl() {
         return "j_acegi_security_check";
     }
 
diff --git a/core/src/main/resources/hudson/model/Hudson/login.jelly b/core/src/main/resources/hudson/model/Hudson/login.jelly
index a80372d7c7b1de97fa30b027b86e4693b2414443..b6c6da3d11376a27c11bfcb15dfd3cb4b7bbb43c 100644
--- a/core/src/main/resources/hudson/model/Hudson/login.jelly
+++ b/core/src/main/resources/hudson/model/Hudson/login.jelly
@@ -4,7 +4,7 @@
     <l:main-panel>
       <div style="margin: 2em;">
         <!-- login form -->
-        <form action="${it.securityRealm.loginUrl}" method="post" style="text-size:smaller">
+        <form action="${it.securityRealm.authenticationGatewayUrl}" method="post" style="text-size:smaller">
           <table>
             <tr>
               <td>User:</td>
@@ -15,6 +15,7 @@
               <td><input type="password" name="j_password" /></td>
             </tr>
           </table>
+          <input type="hidden" name="target" value="${request.getParameter('from')}" />
           <f:submit value="login" />
           <script>
             $('j_username').focus();