diff --git a/assemblies/pentaho-war/src/main/webapp/jsp/PUCLogin.jsp b/assemblies/pentaho-war/src/main/webapp/jsp/PUCLogin.jsp
index d68b76bb92a..4a6c9db4f13 100644
--- a/assemblies/pentaho-war/src/main/webapp/jsp/PUCLogin.jsp
+++ b/assemblies/pentaho-war/src/main/webapp/jsp/PUCLogin.jsp
@@ -350,6 +350,9 @@
     var userState = '';
     <% } %>
 
+    let trimmedValue = $("#login #j_username").val().trim();
+    $("#login #j_username").val(trimmedValue);
+
     jQuery.ajax({
       type: "POST",
       url: "j_spring_security_check",