diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/UserInfoUserDetailsService.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/UserInfoUserDetailsService.java
index 11b73364b..f4e252b83 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/UserInfoUserDetailsService.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/UserInfoUserDetailsService.java
@@ -53,7 +53,8 @@ public class UserInfoUserDetailsService implements UserDetailsService {
 	        	authorities.add(ROLE_ADMIN);
 	        }
 	        
-			User user = new User(userInfo.getUserId(), password, enabled, accountNonExpired, credentialsNonExpired, accountNonLocked, authorities);
+	        // TODO: this should really be our own UserDetails wrapper class, shouldn't it?
+			User user = new User(userInfo.getPreferredUsername(), password, enabled, accountNonExpired, credentialsNonExpired, accountNonLocked, authorities);
 			return user;
 		} else {
 			return null;