diff --git a/core/src/main/java/org/acegisecurity/providers/dao/DaoAuthenticationProvider.java b/core/src/main/java/org/acegisecurity/providers/dao/DaoAuthenticationProvider.java
index cd2c0b85b5..7702220078 100644
--- a/core/src/main/java/org/acegisecurity/providers/dao/DaoAuthenticationProvider.java
+++ b/core/src/main/java/org/acegisecurity/providers/dao/DaoAuthenticationProvider.java
@@ -226,8 +226,9 @@ public class DaoAuthenticationProvider implements AuthenticationProvider,
                 if (this.context != null) {
                     context.publishEvent(new AuthenticationFailureUsernameNotFoundEvent(
                             authentication,
-                            new User(username, "*****", false,
-                                new GrantedAuthority[0])));
+                            new User("".equals(username)
+                                ? "EMPTY_STRING_PROVIDED" : username, "*****",
+                                false, new GrantedAuthority[0])));
                 }
 
                 throw ex;