diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/user/PasswordRecordMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/user/PasswordRecordMapper.xml
index 5b640c299..20d2cfb06 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/user/PasswordRecordMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/user/PasswordRecordMapper.xml
@@ -65,7 +65,8 @@
         );
 
         DELETE FROM [guacamole_user_password_history]
-        WHERE password_history_id NOT IN (
+        WHERE user_id = #{record.userID,jdbcType=INTEGER}
+        AND password_history_id NOT IN (
             SELECT TOP(#{maxHistorySize}) password_history_id
             FROM [guacamole_user_password_history]
             WHERE user_id = #{record.userID,jdbcType=INTEGER}