diff --git a/changelog.html b/changelog.html
index 06219a46ac..e223e346c0 100644
--- a/changelog.html
+++ b/changelog.html
@@ -63,6 +63,9 @@ Upcoming changes</a>
   <li class="rfe">
   OS X installer can optionally create a new user &quot;jenkins&quot; and use
   it. This user has a writable home directory, making it possible to set up ssh for Jenkins.
+  <li class="bug">
+  Stop users being created in memory if they failed to provide all the required registration information correctly.
+   (<a href="https://issues.jenkins-ci.org/browse/JENKINS-7096">issue 7096</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 
diff --git a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
index d2553e4e08..294100981f 100644
--- a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
+++ b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
@@ -302,9 +302,9 @@ public class HudsonPrivateSecurityRealm extends AbstractPasswordBasedSecurityRea
         if(si.username==null || si.username.length()==0)
             si.errorMessage = "User name is required";
         else {
-            User user = User.get(si.username);
-            if(user.getProperty(Details.class)!=null)
-                si.errorMessage = "User name is already taken. Did you forget the password?";
+            User user = User.get(si.username, false);
+            if (null != user)
+                si.errorMessage = "User name is already taken";
         }
 
         if(si.fullname==null || si.fullname.length()==0)