diff --git a/plugins/scm-pam-plugin/src/main/java/sonia/scm/pam/PAMAuthenticationHandler.java b/plugins/scm-pam-plugin/src/main/java/sonia/scm/pam/PAMAuthenticationHandler.java
index 8b3398108f..1cf1c87311 100644
--- a/plugins/scm-pam-plugin/src/main/java/sonia/scm/pam/PAMAuthenticationHandler.java
+++ b/plugins/scm-pam-plugin/src/main/java/sonia/scm/pam/PAMAuthenticationHandler.java
@@ -135,7 +135,7 @@ public class PAMAuthenticationHandler implements AuthenticationHandler
 
           if (unixUser != null)
           {
-            User user = new User(username, username, null);
+            User user = new User(username);
 
             user.setAdmin(isAdmin(unixUser));
             result = new AuthenticationResult(user);
diff --git a/scm-core/src/main/java/sonia/scm/user/User.java b/scm-core/src/main/java/sonia/scm/user/User.java
index 8ede411bf5..8cd188c688 100644
--- a/scm-core/src/main/java/sonia/scm/user/User.java
+++ b/scm-core/src/main/java/sonia/scm/user/User.java
@@ -73,6 +73,18 @@ public class User
    */
   public User() {}
 
+  /**
+   * Constructs ...
+   *
+   *
+   * @param name
+   */
+  public User(String name)
+  {
+    this.name = name;
+    this.displayName = name;
+  }
+
   /**
    * Constructs ...
    *
diff --git a/scm-webapp/src/main/webapp/resources/js/sonia.user.js b/scm-webapp/src/main/webapp/resources/js/sonia.user.js
index 578efb03eb..aecd29dc11 100644
--- a/scm-webapp/src/main/webapp/resources/js/sonia.user.js
+++ b/scm-webapp/src/main/webapp/resources/js/sonia.user.js
@@ -153,7 +153,7 @@ Sonia.user.FormPanel = Ext.extend(Sonia.rest.FormPanel,{
     },{
       fieldLabel: 'Mail',
       name: 'mail',
-      allowBlank: false,
+      allowBlank: true,
       vtype: 'email'
     }];