Index: univention-samba4/conffiles/etc/samba/smb.conf.d/71univention-samba_users
===================================================================
--- univention-samba4/conffiles/etc/samba/smb.conf.d/71univention-samba_users	(Revision 48537)
+++ univention-samba4/conffiles/etc/samba/smb.conf.d/71univention-samba_users	(Arbeitskopie)
@@ -1,4 +1,10 @@
 @!@
+from univention.lib.misc import custom_username
+import re
+
+def split_preserving_quotes(input):
+	return [p for p in re.split("( |\\\".*?\\\"|'.*?')", input) if p.strip()]
+
 if configRegistry.get('samba4/service/smb', 'smbd') in ('smbd', 's3fs'):
 	print '\tguest account = %s' % configRegistry.get('samba/guest_account', 'nobody')	
 	print '\tmap to guest = %s' % configRegistry.get('samba/map_to_guest', 'Bad User')	
@@ -5,5 +11,5 @@
 	invalid_users=configRegistry.get('samba/invalid_users', '')
 	if invalid_users:
 		print '\tinvalid users = %s' % invalid_users
-	print '\tadmin users = %s' % configRegistry.get('samba/adminusers')
+	print '\tadmin users = %s' % " ".join(map(custom_username, split_preserving_quotes(configRegistry.get('samba/adminusers'))))
 @!@
Index: univention-samba4/debian/univention-samba4.univention-config-registry
===================================================================
--- univention-samba4/debian/univention-samba4.univention-config-registry	(Revision 48537)
+++ univention-samba4/debian/univention-samba4.univention-config-registry	(Arbeitskopie)
@@ -24,6 +24,8 @@
 Variables: windows/wins-.*
 Variables: cups/server
 Variables: server/role
+Variables: users/default/.*
+Variables: groups/default/.*
 
 Type: subfile
 Multifile: etc/samba/smb.conf