diff --git a/hsarback/src/de/hsadmin/mods/db/DatabaseUser.java b/hsarback/src/de/hsadmin/mods/db/DatabaseUser.java
index 4647cea..25cd4c3 100644
--- a/hsarback/src/de/hsadmin/mods/db/DatabaseUser.java
+++ b/hsarback/src/de/hsadmin/mods/db/DatabaseUser.java
@@ -43,7 +43,7 @@ public abstract class DatabaseUser extends AbstractEntity implements Serializabl
 	@Column(name = "dbuser_id", columnDefinition = "integer", updatable=false, insertable=false)
 	private long id;
 
-	@AnnFieldIO(validation="[a-z0-9]{5}_[a-z0-9_]{1,}", rw=ReadWriteAccess.WRITEONCE)
+	@AnnFieldIO(validation="[a-z0-9]{5}_[a-z0-9_]{1,26}", rw=ReadWriteAccess.WRITEONCE)
 	@Column(name = "name", columnDefinition = "character varying(64)", updatable=false)
 	private String name;
 
diff --git a/hsarback/src/de/hsadmin/mods/db/MySqlUserModuleImpl.java b/hsarback/src/de/hsadmin/mods/db/MySqlUserModuleImpl.java
index 8ee87ad..05162b9 100644
--- a/hsarback/src/de/hsadmin/mods/db/MySqlUserModuleImpl.java
+++ b/hsarback/src/de/hsadmin/mods/db/MySqlUserModuleImpl.java
@@ -26,9 +26,6 @@ public class MySqlUserModuleImpl extends AbstractModuleImpl {
 		if (name.length() < 7 || name.charAt(5) != '_') {
 			throw new AuthorisationException(loginUser, "add", newEntity);
 		}
-		if (name.length() > 16) {
-			throw new HSAdminException("mysql database name max. length is 16 characters");
-		}
 		EntityManager em = getTransaction().getEntityManager();
 		Query qPac = em.createQuery("SELECT obj FROM Pacs obj WHERE obj.name = :pacName");
 		qPac.setParameter("pacName", name.substring(0, 5));
diff --git a/hsarback/src/de/hsadmin/mods/user/UnixUser.java b/hsarback/src/de/hsadmin/mods/user/UnixUser.java
index a1587b4..369230a 100644
--- a/hsarback/src/de/hsadmin/mods/user/UnixUser.java
+++ b/hsarback/src/de/hsadmin/mods/user/UnixUser.java
@@ -40,7 +40,7 @@ public class UnixUser extends AbstractEntity implements Serializable {
 	@Column(name="userid", columnDefinition="integer", nullable=false, updatable=false)
 	private long userId;
 
-	@AnnFieldIO(validation="[a-z0-9]{5}(-[a-z0-9\\.\\_]{1,})?", rw=ReadWriteAccess.WRITEONCE)
+	@AnnFieldIO(validation="[a-z0-9]{5}(-[a-z0-9\\.\\_]{1,26})?", rw=ReadWriteAccess.WRITEONCE)
 	@Column(name="name", columnDefinition = "character varying(64)", unique=true, updatable=false)
 	private String name;