diff --git a/webapp/config/web.xml b/webapp/config/web.xml
index 767224705..fb949432a 100644
--- a/webapp/config/web.xml
+++ b/webapp/config/web.xml
@@ -1293,11 +1293,6 @@
     <servlet-name>loginExternalAuthReturn</servlet-name>
     <url-pattern>/loginExternalAuthReturn</url-pattern>
   </servlet-mapping>
-  <servlet-mapping>
-    <!-- for backward-compatibility -->
-    <servlet-name>login</servlet-name>
-    <url-pattern>/login_process.jsp</url-pattern> 
-  </servlet-mapping>
   <servlet-mapping>
     <servlet-name>logout</servlet-name>
     <url-pattern>/logout</url-pattern>
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/Controllers.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/Controllers.java
index 2f855bde3..a357c1d37 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/Controllers.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/Controllers.java
@@ -42,8 +42,8 @@ public class Controllers {
     
     public static final String TAB = "/index.jsp";
 
-    public static final String LOGIN_JSP = "/login_process.jsp";
-    public static final String LOGOUT_JSP = "/login_process.jsp";
+    public static final String LOGIN_JSP = "/login";
+    public static final String LOGOUT_JSP = "/logout";
     
     public static final String BASIC_JSP = "/templates/page/basicPage.jsp";
     public static final String DEBUG_JSP = "/templates/page/debug.jsp";
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Login.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Login.java
index a71a67c0f..0e2d58ac8 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Login.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Login.java
@@ -25,15 +25,6 @@ public class Login extends HttpServlet {
 	@Override
 	protected void doPost(HttpServletRequest request,
 			HttpServletResponse response) throws ServletException, IOException {
-		/*
-		 * For backward compatibility, if they requested a logout, honor the
-		 * request.
-		 */
-		if ("Log Out".equals(request.getParameter("loginSubmitMode"))) {
-			request.getRequestDispatcher("/logout").forward(request, response);
-			return;
-		}
-
 		String username = request.getParameter(PARAM_USERNAME);
 		String password = request.getParameter(PARAM_PASSWORD);
 
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java
index 0b8d30096..e685d4fca 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java
@@ -32,7 +32,7 @@ public class UrlBuilder {
         INDIVIDUAL_EDIT("/entityEdit"),
         INDIVIDUAL_LIST("/individuallist"),
         LOGIN("/login"), 
-        LOGOUT("/login_process.jsp"),
+        LOGOUT("/logout"),
         SEARCH("/search"),
         SITE_ADMIN("/siteAdmin"),
         TERMS_OF_USE("/termsOfUse"),
@@ -121,7 +121,7 @@ public class UrlBuilder {
     }
     
     public String getLogoutUrl() {
-        return getPortalUrl(Route.LOGOUT, new ParamMap("loginSubmitMode", "Log Out"));
+        return getPortalUrl(Route.LOGOUT);
     }
     
     public ParamMap getPortalParam() {
diff --git a/webapp/web/themes/default/jsp/menu.jsp b/webapp/web/themes/default/jsp/menu.jsp
index 0e71d1c5f..c6c89e5d6 100755
--- a/webapp/web/themes/default/jsp/menu.jsp
+++ b/webapp/web/themes/default/jsp/menu.jsp
@@ -49,7 +49,6 @@
 
             <c:url var="logoutHref" value="<%= Controllers.LOGOUT_JSP %>">
                 <c:param name="home" value="${currentPortal}" />
-                <c:param name="loginSubmitMode" value="Log Out" /> 
             </c:url>
   
             <c:url var="siteAdminHref" value="<%= Controllers.SITE_ADMIN %>">
diff --git a/webapp/web/themes/enhanced/jsp/identity.jsp b/webapp/web/themes/enhanced/jsp/identity.jsp
index 27c0fab41..c6a67d93d 100644
--- a/webapp/web/themes/enhanced/jsp/identity.jsp
+++ b/webapp/web/themes/enhanced/jsp/identity.jsp
@@ -73,7 +73,6 @@ portal.getRootBreadCrumbURL() : request.getContextPath()+"/";
 
       <c:url var="logoutHref" value="<%= Controllers.LOGOUT_JSP %>">
         <c:param name="home" value="${currentPortal}" />
-        <c:param name="loginSubmitMode" value="Log Out" /> 
       </c:url>
   
       <c:url var="siteAdminHref" value="<%= Controllers.SITE_ADMIN %>">