diff --git a/management/univention-directory-manager-modules/modules/univention/admin/__init__.py b/management/univention-directory-manager-modules/modules/univention/admin/__init__.py
index ed1239d..4de3116 100644
--- a/management/univention-directory-manager-modules/modules/univention/admin/__init__.py
+++ b/management/univention-directory-manager-modules/modules/univention/admin/__init__.py
@@ -514,6 +514,9 @@ def __init__(self, id, short_description=None, long_description='', members=[]):
 from univention.admin import modules, objects, syntax, hook, mapping
 syntax.import_syntax_files()
 hook.import_hook_files()
+modules.update()
+syntax.update_choices()
+
 
 if __name__ == '__main__':
 	prop = property('_replace')
diff --git a/management/univention-directory-manager-modules/modules/univention/admincli/adduser.py b/management/univention-directory-manager-modules/modules/univention/admincli/adduser.py
index 19ff48f..62440bc 100755
--- a/management/univention-directory-manager-modules/modules/univention/admincli/adduser.py
+++ b/management/univention-directory-manager-modules/modules/univention/admincli/adduser.py
@@ -46,9 +46,6 @@
 import univention.admin.handlers.groups.group
 import univention.admin.handlers.computers.windows
 
-# update choices-lists which are defined in LDAP
-univention.admin.syntax.update_choices()
-
 
 def status(msg):
 	out = ''
diff --git a/management/univention-directory-manager-modules/modules/univention/admincli/admin.py b/management/univention-directory-manager-modules/modules/univention/admincli/admin.py
index 4e419b1..e51a20b 100755
--- a/management/univention-directory-manager-modules/modules/univention/admincli/admin.py
+++ b/management/univention-directory-manager-modules/modules/univention/admincli/admin.py
@@ -50,11 +50,6 @@
 import univention.config_registry
 import univention.admin.ipaddress
 
-univention.admin.modules.update()
-
-# update choices-lists which are defined in LDAP
-univention.admin.syntax.update_choices()
-
 # usage information
 
 
diff --git a/management/univention-management-console-module-ipchange/umc/python/ipchange/__init__.py b/management/univention-management-console-module-ipchange/umc/python/ipchange/__init__.py
index 6dc993e..b421688 100644
--- a/management/univention-management-console-module-ipchange/umc/python/ipchange/__init__.py
+++ b/management/univention-management-console-module-ipchange/umc/python/ipchange/__init__.py
@@ -41,11 +41,6 @@
 from univention.management.console.base import Base
 from univention.management.console.log import MODULE
 
-univention.admin.modules.update()
-
-# update choices-lists which are defined in LDAP
-univention.admin.syntax.update_choices()
-
 
 class Instance(Base):
 
diff --git a/services/univention-s4-connector/modules/univention/s4connector/__init__.py b/services/univention-s4-connector/modules/univention/s4connector/__init__.py
index 221a4be..d667ebd 100644
--- a/services/univention-s4-connector/modules/univention/s4connector/__init__.py
+++ b/services/univention-s4-connector/modules/univention/s4connector/__init__.py
@@ -56,11 +56,6 @@
 
 term_signal_caught = False
 
-univention.admin.modules.update()
-
-# update choices-lists which are defined in LDAP
-univention.admin.syntax.update_choices()
-
 
 # util functions defined during mapping