diff --git a/docs/changelog.rst b/docs/changelog.rst
index ff8024b..149e45c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+* :feature:`-` allow empty password input in
+  :py:class:`osusers.admin.UserCreationForm` to allow generated passwords for
+  new users
+
 * :release:`0.3.0 <2014-12-27>`
 * :feature:`-` call create/delete mailbox tasks when saving/deleting mailboxes
 * :support:`-` use celery routers from gvacommon
diff --git a/gnuviechadmin/osusers/admin.py b/gnuviechadmin/osusers/admin.py
index a46dbc5..d2835e2 100644
--- a/gnuviechadmin/osusers/admin.py
+++ b/gnuviechadmin/osusers/admin.py
@@ -27,10 +27,14 @@ class UserCreationForm(forms.ModelForm):
     A form for creating system users.
 
     """
-    password1 = forms.CharField(label=_('Password'),
-                                widget=forms.PasswordInput)
-    password2 = forms.CharField(label=_('Password (again)'),
-                                widget=forms.PasswordInput)
+    password1 = forms.CharField(
+        label=_('Password'), widget=forms.PasswordInput,
+        required=False,
+    )
+    password2 = forms.CharField(
+        label=_('Password (again)'), widget=forms.PasswordInput,
+        required=False,
+    )
 
     class Meta:
         model = User