diff --git a/management/univention-directory-manager-modules/modules/univention/admin/handlers/users/user.py b/management/univention-directory-manager-modules/modules/univention/admin/handlers/users/user.py
index a439a9d..8ccdfee 100644
--- a/management/univention-directory-manager-modules/modules/univention/admin/handlers/users/user.py
+++ b/management/univention-directory-manager-modules/modules/univention/admin/handlers/users/user.py
@@ -1355,8 +1355,8 @@ def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [])
 		self.options=[]
 		if 'objectClass' in self.oldattr:
 			ocs = set(self.oldattr['objectClass'])
-			for opt in ('posix', 'samba', 'person', 'kerberos', 'mail', 'pki', 'ldap_pwd'):
-				if options[opt].matches(ocs):
+			for opt, option in options.iteritems():
+				if not option.disabled and option.matches(ocs):
 					self.options.append(opt)
 		else:
 			univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'users/user.py: reset options to default by _define_options' )