diff --git a/treebase-core/pom.xml b/treebase-core/pom.xml
index f47d7655f..160f06557 100644
--- a/treebase-core/pom.xml
+++ b/treebase-core/pom.xml
@@ -41,6 +41,13 @@
 	</repositories>
 
 	<dependencies>
+		<!-- Servlet API is needed for Spring Security handlers -->
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>4.0.1</version>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>com.mchange</groupId>
 			<artifactId>c3p0</artifactId>
diff --git a/treebase-core/src/main/java/org/cipres/treebase/security/PasswordUpgradeAuthenticationSuccessHandler.java b/treebase-core/src/main/java/org/cipres/treebase/security/PasswordUpgradeAuthenticationSuccessHandler.java
index ad877586a..130f9a7fd 100644
--- a/treebase-core/src/main/java/org/cipres/treebase/security/PasswordUpgradeAuthenticationSuccessHandler.java
+++ b/treebase-core/src/main/java/org/cipres/treebase/security/PasswordUpgradeAuthenticationSuccessHandler.java
@@ -87,7 +87,7 @@ private void upgradePassword(UserDetails userDetails, String rawPassword) {
 
 		try {
 			// Load the user entity
-			User user = userHome.findByName(userDetails.getUsername());
+			User user = userHome.findByUserName(userDetails.getUsername());
 			if (user == null) {
 				LOGGER.warn("Cannot upgrade password: user not found: {}", userDetails.getUsername());
 				return;