diff --git a/hsarback/.classpath b/hsarback/.classpath
index a3b02bc..0b07c1a 100644
--- a/hsarback/.classpath
+++ b/hsarback/.classpath
@@ -37,6 +37,6 @@
 	<classpathentry kind="lib" path="lib/org.apache.bval.bundle-0.5.jar"/>
 	<classpathentry kind="lib" path="lib/serp-1.15.1.jar"/>
 	<classpathentry kind="lib" path="lib/xbean-asm6-shaded-4.8.jar"/>
-	<classpathentry kind="lib" path="lib/hsadmin-util-4.0.3-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="lib/hsadmin-util-4.0.4-SNAPSHOT.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/hsarback/lib/hsadmin-util-4.0.3-SNAPSHOT.jar b/hsarback/lib/hsadmin-util-4.0.4-SNAPSHOT.jar
similarity index 65%
rename from hsarback/lib/hsadmin-util-4.0.3-SNAPSHOT.jar
rename to hsarback/lib/hsadmin-util-4.0.4-SNAPSHOT.jar
index 8c60531..cde4b6a 100644
Binary files a/hsarback/lib/hsadmin-util-4.0.3-SNAPSHOT.jar and b/hsarback/lib/hsadmin-util-4.0.4-SNAPSHOT.jar differ
diff --git a/hsarback/src/de/hsadmin/mods/user/UnixUserModuleImpl.java b/hsarback/src/de/hsadmin/mods/user/UnixUserModuleImpl.java
index fa1e64a..45a1efe 100644
--- a/hsarback/src/de/hsadmin/mods/user/UnixUserModuleImpl.java
+++ b/hsarback/src/de/hsadmin/mods/user/UnixUserModuleImpl.java
@@ -11,6 +11,7 @@ import de.hsadmin.core.model.AbstractModuleImpl;
 import de.hsadmin.core.model.AuthorisationException;
 import de.hsadmin.core.model.Transaction;
 import de.hsadmin.core.util.HSAdminException;
+import de.hsadmin.core.util.PasswordTool;
 import de.hsadmin.hostsharing.BasePacType;
 import de.hsadmin.hostsharing.MultiOption;
 import de.hsadmin.mods.pac.Pac;
@@ -98,6 +99,7 @@ public class UnixUserModuleImpl extends AbstractModuleImpl {
 		if (passWord.indexOf(':') >= 0) {
 			throw new AuthorisationException(loginUser, "add", newUnixUser, "userId");
 		}
+		PasswordTool.checkPasswordComplexity(passWord);
 		Query qPac = em.createQuery("SELECT obj FROM Pacs obj WHERE obj.name = :pacName");
 		qPac.setParameter("pacName", userName.substring(0, 5));
 		Object singleResult = qPac.getSingleResult();
@@ -164,7 +166,11 @@ public class UnixUserModuleImpl extends AbstractModuleImpl {
 		if (!attachedUnixUser.getName().equals(detachedUnixUser.getName())) {
 			throw new AuthorisationException(loginUser, "update", detachedUnixUser, "name");
 		}
-		attachedUnixUser.setPassword(detachedUnixUser.getPassword());
+		final String passWord = detachedUnixUser.getPassword();
+		if (passWord != null && passWord.length() > 0) {
+			PasswordTool.checkPasswordComplexity(passWord);
+			attachedUnixUser.setPassword(passWord);
+		}
 		if (hasFullAccessOnPacOf(attachedUnixUser)) {
 			attachedUnixUser.setComment(detachedUnixUser.getComment());
 			attachedUnixUser.setHomedir(detachedUnixUser.getHomedir());