diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/approval/JdbcApprovalStore.java b/server/src/main/java/org/cloudfoundry/identity/uaa/approval/JdbcApprovalStore.java
index 43815b0345b..b76cd00f485 100644
--- a/server/src/main/java/org/cloudfoundry/identity/uaa/approval/JdbcApprovalStore.java
+++ b/server/src/main/java/org/cloudfoundry/identity/uaa/approval/JdbcApprovalStore.java
@@ -312,7 +312,7 @@ private static class AuthorizationRowMapper implements RowMapper<Approval> {
 
         @Override
         public Approval mapRow(ResultSet rs, int rowNum) throws SQLException {
-            String userName = rs.getString(1);
+            String userId = rs.getString(1);
             String clientId = rs.getString(2);
             String scope = rs.getString(3);
             Date expiresAt = rs.getTimestamp(4);
@@ -320,7 +320,7 @@ public Approval mapRow(ResultSet rs, int rowNum) throws SQLException {
             Date lastUpdatedAt = rs.getTimestamp(6);
 
             Approval approval = new Approval()
-                .setUserId(userName)
+                .setUserId(userId)
                 .setClientId(clientId)
                 .setScope(scope)
                 .setExpiresAt(expiresAt)