Index: univention-pam/conffiles/etc/security/limits.conf
===================================================================
--- univention-pam/conffiles/etc/security/limits.conf	(Revision 47141)
+++ univention-pam/conffiles/etc/security/limits.conf	(Arbeitskopie)
@@ -9,7 +9,8 @@
 #
 # Examples:
 #   $ univention-config-registry set 'security/limits/group/Domain Users/hard/nproc'=1000
-#   $ univention-config-registry set 'security/limits/user/default/hard/nice'=-5
+#   $ univention-config-registry set 'security/limits/user//hard/nice'=-5	## factory default
+#   $ univention-config-registry set 'security/limits/user/*/hard/nice'=-5	## customer default
 #
 # See also the manpage for limits.conf:
 # $ man 5 limits.conf
@@ -44,7 +45,7 @@
 	# TODO: What about '"' in name?
 	if ' ' in name or '\t' in name:
 		name = '"%s"' % name
-	if name == 'default':
+	if name == '':
 		name = '*'
 		scope = ''
 		output.insert(1, ('%s%s' % (scope, name, ), type, item, configRegistry[key], ))
Index: univention-pam/debian/univention-pam.univention-config-registry
===================================================================
--- univention-pam/debian/univention-pam.univention-config-registry	(Revision 47142)
+++ univention-pam/debian/univention-pam.univention-config-registry	(Arbeitskopie)
@@ -57,7 +57,7 @@
 
 Type: file
 File: etc/security/limits.conf
-Variables: security/limits(/[^/]+){4}
+Variables: security/limits/[^/]+/[^/]*(/[^/]+){2}
 Variables: users/default/.*
 Variables: groups/default/.*