diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/UserPersistence.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/UserPersistence.java
index 720d6d68922f04df4f366af1022230146941aae8..f0fab8b667e26e0a2b1dcc24fd9b801a980b167a 100755
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/UserPersistence.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/UserPersistence.java
@@ -147,7 +147,7 @@ public interface UserPersistence<T extends Principal>
      * @throws TransientException If an temporary, unexpected problem occurred.
      * @throws AccessControlException If the operation is not permitted.
      */
-    Boolean loginUser(String userID, String password)
+    Boolean doLogin(String userID, String password)
             throws UserNotFoundException, TransientException, 
             AccessControlException;
    
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
index d3d21770bfb21db18919cc54e533b6d9405fd85e..15850110ef4eb32c64600c652055c942c043b18c 100755
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
@@ -182,7 +182,7 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO
      * @throws TransientException
      * @throws UserNotFoundException
      */
-    public Boolean loginUser(final String username, final String password)
+    public Boolean doLogin(final String username, final String password)
         throws TransientException, UserNotFoundException
     {
         try
@@ -201,7 +201,7 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO
         }
         catch (LDAPException e)
         {
-            logger.debug("loginUser Exception: " + e, e);
+            logger.debug("doLogin Exception: " + e, e);
 
             if (e.getResultCode() == ResultCode.INVALID_CREDENTIALS)
             {
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserPersistence.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserPersistence.java
index b0a3c5b3929f96a295022bcc4c6127cf3cb49eb1..bacfe86a668a19a41ed6dd4768958e704cb6abe6 100755
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserPersistence.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserPersistence.java
@@ -214,14 +214,14 @@ public class LdapUserPersistence<T extends Principal>
      * @throws TransientException If an temporary, unexpected problem occurred.
      * @throws AccessControlException If the operation is not permitted.
      */
-    public Boolean loginUser(String userID, String password)
+    public Boolean doLogin(String userID, String password)
             throws UserNotFoundException, TransientException, AccessControlException
     {
         LdapUserDAO<T> userDAO = null;
         try
         {
             userDAO = new LdapUserDAO<T>(this.config);
-            return userDAO.loginUser(userID, password);
+            return userDAO.doLogin(userID, password);
         }
         finally
         {
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/LoginServlet.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/LoginServlet.java
index 260933be652aad44ab4438e91741e0581c3d3c98..f1daa9db4f5c8870590ca10c0698b5cbe55ce33c 100755
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/LoginServlet.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/LoginServlet.java
@@ -106,7 +106,7 @@ public class LoginServlet extends HttpServlet
             {
                 if (StringUtil.hasText(password))
                 {
-                	if (new LdapUserPersistence().loginUser(userID, password))
+                	if (new LdapUserPersistence().doLogin(userID, password))
                 	{
 	            	    String token = new SSOCookieManager().generate(new HttpPrincipal(userID));
 	            	    response.setContentType(CONTENT_TYPE);
diff --git a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java b/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java
index 48d6a14212584dee12433e58d8f7338aab4ae47d..68c0c6468659b82000c82bc37e13c0cd273aa1fa 100644
--- a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java
+++ b/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java
@@ -454,7 +454,7 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest
             {
                 try
                 {
-                    getUserDAO().loginUser(username, password);
+                    getUserDAO().doLogin(username, password);
                 }
                 catch (Exception e)
                 {
@@ -510,7 +510,7 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest
             {
                 try
                 {
-                    getUserDAO().loginUser(username, password);
+                    getUserDAO().doLogin(username, password);
                 }
                 catch (Exception e)
                 {