diff --git a/spring-5/src/main/java/com/baeldung/securityextrafields/CustomAuthenticationFilter.java b/spring-5/src/main/java/com/baeldung/securityextrafields/CustomAuthenticationFilter.java
index 5a54552dfd..b5d628628d 100644
--- a/spring-5/src/main/java/com/baeldung/securityextrafields/CustomAuthenticationFilter.java
+++ b/spring-5/src/main/java/com/baeldung/securityextrafields/CustomAuthenticationFilter.java
@@ -43,8 +43,9 @@ public class CustomAuthenticationFilter extends UsernamePasswordAuthenticationFi
             domain = "";
         }
 
-        username = username.trim();
-        return new UsernamePasswordAuthenticationToken(username + ":" + domain, password);        
+        String usernameDomain = String.format("%s%s%s", username.trim(), 
+            String.valueOf(Character.LINE_SEPARATOR), domain);
+        return new UsernamePasswordAuthenticationToken(usernameDomain, password);        
     }
 
     private String obtainDomain(HttpServletRequest request) {
diff --git a/spring-5/src/main/java/com/baeldung/securityextrafields/CustomUserDetailsService.java b/spring-5/src/main/java/com/baeldung/securityextrafields/CustomUserDetailsService.java
index 0e2858c68f..be02834852 100644
--- a/spring-5/src/main/java/com/baeldung/securityextrafields/CustomUserDetailsService.java
+++ b/spring-5/src/main/java/com/baeldung/securityextrafields/CustomUserDetailsService.java
@@ -17,7 +17,7 @@ public class CustomUserDetailsService implements UserDetailsService {
 
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-        String[] usernameAndDomain = StringUtils.split(username, ":");
+        String[] usernameAndDomain = StringUtils.split(username, String.valueOf(Character.LINE_SEPARATOR));
         if (usernameAndDomain == null || usernameAndDomain.length != 2) {
             throw new UsernameNotFoundException("Username and domain must be provided");
         }