Index: univention-directory-manager-modules/debian/control
===================================================================
--- univention-directory-manager-modules/debian/control	(Revision 46723)
+++ univention-directory-manager-modules/debian/control	(Arbeitskopie)
@@ -19,7 +19,7 @@
  python-m2crypto,
  python-smbpasswd,
  shell-univention-lib,
- python-univention-lib (>= 3.0.25-5),
+ python-univention-lib (>= 3.0.26-14),
  python-univention-directory-manager-cli (= ${binary:Version}),
  univention-ldap-server (>=10.0.17-4) | univention-server-member | univention-basesystem
 Provides: ${python:Provides}
Index: univention-directory-manager-modules/modules/univention/admin/license.py
===================================================================
--- univention-directory-manager-modules/modules/univention/admin/license.py	(Revision 46723)
+++ univention-directory-manager-modules/modules/univention/admin/license.py	(Arbeitskopie)
@@ -38,6 +38,7 @@
 import univention.admin.localization
 import univention.admin.license_data as licenses
 import univention.config_registry
+from univention.lib.misc import custom_username
 
 translation=univention.admin.localization.translation('univention/admin')
 _=translation.translate
@@ -65,21 +66,21 @@
 		self.version = '1'
 		self.searchResult = None
 		self.sysAccountNames = (
-			'Administrator',
+			custom_username('Administrator'),
 			'join-backup',
 			'join-slave',
 			'spam',
 			'oxadmin',
 			'krbtgt',
-			'Guest',
+			custom_username('Guest'),
 			'dns-*',
 			'http-%s' % configRegistry.get('hostname'),
 			'http-proxy-%s' % configRegistry.get('hostname'),
 			'zarafa-%s' % configRegistry.get('hostname'),
-			'SBSMonAcct',				## SBS account
-			'Network Administrator',	## SBS role
-			'Standard User',			## SBS role
-			'WebWorkplaceTools',		## SBS role "Standard User with administration links"
+			custom_username('SBSMonAcct'),				## SBS account
+			custom_username('Network Administrator'),	## SBS role
+			custom_username('Standard User'),			## SBS role
+			custom_username('WebWorkplaceTools'),		## SBS role "Standard User with administration links"
 			'IUSR_WIN-*',				## IIS account
 		)
 		self.sysAccountsFound = 0