diff --git a/management/mailconfig.py b/management/mailconfig.py
index b9852def..fbdc5d4e 100755
--- a/management/mailconfig.py
+++ b/management/mailconfig.py
@@ -10,7 +10,7 @@
 # Python 3 in setup/questions.sh to validate the email
 # address entered by the user.
 
-import subprocess, shutil, os, sqlite3, re, ldap3, uuid
+import subprocess, shutil, os, sqlite3, re, ldap3, uuid, hashlib
 import utils, backend
 from email_validator import validate_email as validate_email_, EmailNotValidError
 import idna
@@ -637,8 +637,12 @@ def add_mail_user(email, pw, privs, env):
 	if conn.wait(id).count() > 0:
 		return ("An alias exists with that address.", 400)
 	
-	# Generate a unique id for uid
-	uid = '%s' % uuid.uuid4()
+	## Generate a unique id for uid
+	#uid = '%s' % uuid.uuid4()
+	# use a sha-1 hash of maildrop for uid
+	m = hashlib.sha1()
+	m.update(bytearray(email.lower(),'utf-8'))
+	uid = m.hexdigest()
 
 	# choose a common name and surname (required attributes)
 	cn = email.split("@")[0].replace('.',' ').replace('_',' ')
diff --git a/setup/migration_13.py b/setup/migration_13.py
index e91bc3b7..81cdd9b4 100644
--- a/setup/migration_13.py
+++ b/setup/migration_13.py
@@ -5,7 +5,7 @@
 # helper functions for migration #13
 #
 
-import uuid, os, sqlite3, ldap3
+import uuid, os, sqlite3, ldap3, hashlib
 
 
 def add_user(env, ldapconn, search_base, users_base, domains_base, email, password, privs, cn=None):
@@ -29,9 +29,13 @@ def add_user(env, ldapconn, search_base, users_base, domains_base, email, passwo
 		print("user already exists: %s" % email)
 		return ldapconn.response[0]['dn']
 
-	# Generate a unique id for uid
-	uid = '%s' % uuid.uuid4()
-
+	## Generate a unique id for uid
+	#uid = '%s' % uuid.uuid4()
+	# use a sha-1 hash of the email address for uid
+	m = hashlib.sha1()
+	m.update(bytearray(email.lower(),'utf-8'))
+	uid = m.hexdigest()
+	
 	# Attributes to apply to the new ldap entry
 	attrs = {
 		"mail" : email,