diff --git a/docker-compose.yml b/docker-compose.yml
index 3db3e1160..0acfbe777 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -88,7 +88,6 @@ services:
       - ./treebase-web/src/main/webapp/test:/usr/local/tomcat/webapps/treebase-web/test
       # Mount root-level JSP files
       - ./treebase-web/src/main/webapp/index.jsp:/usr/local/tomcat/webapps/treebase-web/index.jsp
-      - ./treebase-web/src/main/webapp/login.jsp:/usr/local/tomcat/webapps/treebase-web/login.jsp
       - ./treebase-web/src/main/webapp/logout.jsp:/usr/local/tomcat/webapps/treebase-web/logout.jsp
       - ./treebase-web/src/main/webapp/error.jsp:/usr/local/tomcat/webapps/treebase-web/error.jsp
       - ./treebase-web/src/main/webapp/error-403.jsp:/usr/local/tomcat/webapps/treebase-web/error-403.jsp
diff --git a/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/top-security.xml b/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/top-security.xml
index 0927e28f6..cce912fae 100644
--- a/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/top-security.xml
+++ b/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/top-security.xml
@@ -21,16 +21,16 @@
 
 		<!-- Form-based authentication -->
 		<security:form-login
-			login-page="/login.jsp"
+			login-page="/login.html"
 			login-processing-url="/j_security_check"
 			username-parameter="j_username"
 			password-parameter="j_password"
 			default-target-url="/user/processUser.html"
 			always-use-default-target="true"
-			authentication-failure-url="/login.jsp?error=true"/>
+			authentication-failure-url="/login.html?error=true"/>
 
 		<!-- Logout configuration -->
-		<security:logout logout-url="/logout" logout-success-url="/login.jsp"/>
+		<security:logout logout-url="/logout" logout-success-url="/login.html"/>
 
 		<!-- Session management with fixation protection -->
 		<security:session-management session-fixation-protection="newSession"/>
diff --git a/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ResetPasswordController.java b/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ResetPasswordController.java
index 57e21af8d..35a7b0598 100644
--- a/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ResetPasswordController.java
+++ b/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ResetPasswordController.java
@@ -181,7 +181,7 @@ public ModelAndView onSubmit(
 		}
 
 		// Redirect to login with success parameter
-		// The success message will be handled by login.jsp based on the ?reset=success parameter
+		// The success message will be handled by login.html based on the ?reset=success parameter
 		return new ModelAndView(getSuccessView());
 	}
 
diff --git a/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java b/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java
index db009ae9e..feff7d175 100644
--- a/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java
+++ b/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java
@@ -81,7 +81,7 @@ public String processMultiparts(MultiPart multiPart) {
 		String BASEURL = TreebaseUtil.getSiteUrl();
 		// apache server re-write the application path to localhost 
 		//String[] baseURL=httpRequest.getRequestURL().toString().split("handshaking");
-        String importURL= BASEURL + "login.jsp?importKey=" + systemTime;
+        String importURL= BASEURL + "login.html?importKey=" + systemTime;
      
         return importURL; 
   
diff --git a/treebase-web/src/main/webapp/login.jsp b/treebase-web/src/main/webapp/WEB-INF/pages/login.jsp
similarity index 100%
rename from treebase-web/src/main/webapp/login.jsp
rename to treebase-web/src/main/webapp/WEB-INF/pages/login.jsp
diff --git a/treebase-web/src/main/webapp/WEB-INF/pages/passwordForm.jsp b/treebase-web/src/main/webapp/WEB-INF/pages/passwordForm.jsp
index 31ce619cf..0e97d5085 100644
--- a/treebase-web/src/main/webapp/WEB-INF/pages/passwordForm.jsp
+++ b/treebase-web/src/main/webapp/WEB-INF/pages/passwordForm.jsp
@@ -6,7 +6,7 @@
 <p>Please fill out either the user name or the email address on file. If an account exists, we will send a password reset link to the registered email address.</p>
 <p><strong>Note:</strong> For security reasons, we never send passwords via email. You will receive a link to create a new password.</p>
 
-<c:url var="homepageURL" value="/login.jsp" />
+<c:url var="homepageURL" value="/login.html" />
 
 <spring:bind path="user.*">
     <c:if test="${not empty status.errorMessages}">
diff --git a/treebase-web/src/main/webapp/WEB-INF/pages/resetPasswordForm.jsp b/treebase-web/src/main/webapp/WEB-INF/pages/resetPasswordForm.jsp
index fea507a2e..60d7ec2d1 100644
--- a/treebase-web/src/main/webapp/WEB-INF/pages/resetPasswordForm.jsp
+++ b/treebase-web/src/main/webapp/WEB-INF/pages/resetPasswordForm.jsp
@@ -3,7 +3,7 @@
 <title><fmt:message key="user.password.reset.form.title"/></title>
 <content tag="heading"><fmt:message key="user.password.reset.form.title"/></content>
 
-<c:url var="homepageURL" value="/login.jsp" />
+<c:url var="homepageURL" value="/login.html" />
 
 <c:if test="${not empty errors}">
     <div class="error">
diff --git a/treebase-web/src/main/webapp/WEB-INF/treebase-security.xml b/treebase-web/src/main/webapp/WEB-INF/treebase-security.xml
index 9d8607562..3eb4f0835 100644
--- a/treebase-web/src/main/webapp/WEB-INF/treebase-security.xml
+++ b/treebase-web/src/main/webapp/WEB-INF/treebase-security.xml
@@ -28,17 +28,17 @@
 
 		<!-- Form-based authentication -->
 		<security:form-login
-			login-page="/login.jsp"
+			login-page="/login.html"
 			login-processing-url="/j_security_check"
 			username-parameter="j_username"
 			password-parameter="j_password"
 			default-target-url="/user/processUser.html"
 			always-use-default-target="true"
-			authentication-failure-url="/login.jsp?error=true"
+			authentication-failure-url="/login.html?error=true"
 			authentication-success-handler-ref="passwordUpgradeSuccessHandler"/>
 
 		<!-- Logout configuration -->
-		<security:logout logout-url="/logout" logout-success-url="/login.jsp"/>
+		<security:logout logout-url="/logout" logout-success-url="/login.html"/>
 
 		<!-- Session management with fixation protection -->
 		<security:session-management session-fixation-protection="newSession"/>
diff --git a/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml b/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml
index fe1119cff..2bb4fae1a 100644
--- a/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml
+++ b/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml
@@ -75,8 +75,8 @@
 		<property name="commandName"><value>user</value></property>
 		<property name="commandClass"><value>org.cipres.treebase.domain.admin.User</value></property>
 		<property name="formView"><value>userForm</value></property>
-		<property name="successView"><value>redirect:login.jsp</value></property>
-		<property name="cancelView"><value>redirect:login.jsp</value></property>
+		<property name="successView"><value>redirect:login.html</value></property>
+		<property name="cancelView"><value>redirect:login.html</value></property>
 		<property name="userService"><ref bean="userService"></ref></property>
 		<property name="userHome"><ref bean="userHome"></ref></property>
 		<property name="passwordEncoder"><ref bean="passwordEncoder"></ref></property>
@@ -117,7 +117,7 @@
 		<property name="commandName"><value>resetPassword</value></property>
 		<property name="commandClass"><value>java.lang.String</value></property>
 		<property name="formView"><value>resetPasswordForm</value></property>
-		<property name="successView"><value>redirect:/login.jsp?reset=success</value></property>
+		<property name="successView"><value>redirect:/login.html?reset=success</value></property>
 		<property name="passwordResetTokenHome"><ref bean="passwordResetTokenHome"></ref></property>
 		<property name="userHome"><ref bean="userHome"></ref></property>
 		<property name="passwordEncoder"><ref bean="passwordEncoder"></ref></property>
diff --git a/treebase-web/src/main/webapp/decorators/defaultSearchTemplate.jsp b/treebase-web/src/main/webapp/decorators/defaultSearchTemplate.jsp
index a121a8974..7b11e207e 100644
--- a/treebase-web/src/main/webapp/decorators/defaultSearchTemplate.jsp
+++ b/treebase-web/src/main/webapp/decorators/defaultSearchTemplate.jsp
@@ -143,7 +143,7 @@
 	<c:if test="${pageContext['request'].remoteUser == null}">	
 		<ul id="login">
 			<li><strong>not logged in</strong></li>
-			<li><strong><a href="<c:url value="/login.jsp"/>"><fmt:message key="nav.login"/></a></strong></li>
+			<li><strong><a href="<c:url value="/login.html"/>"><fmt:message key="nav.login"/></a></strong></li>
 		</ul>				
 	</c:if>	
 	<jsp:include page="/common/search-topnav.jsp"/>