diff --git a/admin/editaccount.php b/admin/editaccount.php
index 4e4f983ea8..8eac25937f 100755
--- a/admin/editaccount.php
+++ b/admin/editaccount.php
@@ -27,8 +27,11 @@
   if ($submit) {
      $totalerrors = 0;
 
-     if (strlen($n_loginid) > 8)
-        $error[$totalerrors++] = lang("The loginid can not be more then 8 characters");
+     if ($phpgw_info["server"]["auth_type"] == "ldap") {
+        if (strlen($n_loginid) > 8) {
+           $error[$totalerrors++] = lang("The loginid can not be more then 8 characters");
+        }
+     }
     
      if ($old_loginid != $n_loginid) {
         if (account_exsists($n_loginid)) {
diff --git a/admin/newaccount.php b/admin/newaccount.php
index b54517327d..c3a8a5a586 100755
--- a/admin/newaccount.php
+++ b/admin/newaccount.php
@@ -45,8 +45,11 @@
   if ($submit) {
      $totalerrors = 0;
 
-     if (strlen($n_loginid) > 8)
-        $error[$totalerrors++] = lang("The loginid can not be more then 8 characters");
+     if ($phpgw_info["server"]["auth_type"] == "ldap") {
+        if (strlen($n_loginid) > 8) {
+           $error[$totalerrors++] = lang("The loginid can not be more then 8 characters");
+        }
+     }
   
      if (! $n_loginid)
         $error[$totalerrors++] = lang("You must enter a loginid");