diff --git a/gvaldap/ldaptasks/tasks.py b/gvaldap/ldaptasks/tasks.py
index f17a7e6..05c2da8 100644
--- a/gvaldap/ldaptasks/tasks.py
+++ b/gvaldap/ldaptasks/tasks.py
@@ -97,6 +97,8 @@ def create_ldap_user(username, uid, gid, gecos, homedir, shell, password):
     if password is not None:
         ldapuser.set_password(password)
         _LOGGER.info('set password for LDAP user %s', ldapuser.dn)
+    ldapuser.save()
+    _LOGGER.info('LDAP user %s created', ldapuser.dn)
     if ldapuser.username in ldapgroup.members:
         _LOGGER.info(
             'LDAP user %s is already member of LDAP group %s',
@@ -107,8 +109,6 @@ def create_ldap_user(username, uid, gid, gecos, homedir, shell, password):
         _LOGGER.info(
             'LDAP user %s has been added to LDAP group %s',
             ldapuser.dn, ldapgroup.dn)
-    ldapuser.save()
-    _LOGGER.info('LDAP user %s created', ldapuser.dn)
     return ldapuser.dn