diff --git a/htdocs/lib/FormController.php b/htdocs/lib/FormController.php
index a78ae96..eadaf4b 100644
--- a/htdocs/lib/FormController.php
+++ b/htdocs/lib/FormController.php
@@ -98,6 +98,12 @@ class FormController {
             ,'mailaccept' => array('filter' => FILTER_DEFAULT, 'flags' => FILTER_FORCE_ARRAY)
         ), true);
 
+        self::$form['mailaccept'] = array_map(function($value) {
+            if (!empty($value)) {
+                return $value.'@'.self::$form['domain'];
+            }
+        }, self::$form['mailaccept']);
+
         if (!empty(self::$form['password'])) { self::filterPassword(); }
 
         unset($_POST);
diff --git a/htdocs/lib/LdapDomain.php b/htdocs/lib/LdapDomain.php
index ff6abb6..8d29508 100644
--- a/htdocs/lib/LdapDomain.php
+++ b/htdocs/lib/LdapDomain.php
@@ -82,7 +82,7 @@ class LdapDomain extends LdapServer {
         $info[LdapAccount::$dn] = $mail;
         $info["cn"] = $name;
         $info["homeDirectory"] = "/home/vmail/" .$this->getName(). "/" .$uid. "/";
-        $info["uidNumber"] = 2022;
+        $info["uidNumber"] = 5000;
         $info["gidNumber"] = $this->getGid();
         $info["isActive"] = ($active) ? 'TRUE' : 'FALSE';
         $info["isAdmin"] = ($admin) ? 'TRUE' : 'FALSE';