--- a/ucs/services/univention-samba/conffiles/etc/samba/base.conf
+++ b/ucs/services/univention-samba/conffiles/etc/samba/base.conf
@@ -62,7 +62,7 @@ if configRegistry['samba/share/groups']=='yes':
 if configRegistry.is_true('samba/share/netlogon', True):
 	print '[netlogon]'
 	print '\tcomment = Domain logon service'
-	print '\tpath = 	/var/lib/samba/netlogon'
+	print '\tpath = 	%s' % configRegistry.get('samba/share/netlogon/path', '/var/lib/samba/netlogon')
 	print '\tpublic = no '
 	print '\tpreserve case = yes'
 	print '\tcase sensitive = no'
--- a/ucs/services/univention-samba4/conffiles/etc/samba/base.conf
+++ b/ucs/services/univention-samba4/conffiles/etc/samba/base.conf
@@ -4,7 +4,8 @@
 if configRegistry.is_true('samba/share/netlogon', True):
 	print '[netlogon]'
 	print '\tcomment = Domain logon service'
-	print '\tpath = /var/lib/samba/sysvol/%s/scripts' % configRegistry.get('kerberos/realm', '').lower()
+	default_netlogon_path = '/var/lib/samba/sysvol/%s/scripts' % configRegistry.get('kerberos/realm', '').lower()
+	print '\tpath = %s' % configRegistry.get('samba/share/netlogon/path', default_netlogon_path)
 	if configRegistry.get('samba4/service/smb', 'smbd') in ('smbd', 's3fs'):
 		print '\tpublic = no '
 		print '\tpreserve case = yes'