diff --git a/univention/templates/files/etc/samba/smb.conf.d/61univention-samba_misc b/univention/templates/files/etc/samba/smb.conf.d/61univention-samba_misc
index ad7d08c..ea79c44 100644
--- a/univention/templates/files/etc/samba/smb.conf.d/61univention-samba_misc
+++ b/univention/templates/files/etc/samba/smb.conf.d/61univention-samba_misc
@@ -1,4 +1,4 @@
-@!@
+q@!@
 print '\t; miscellaneous settings, mostly for file services'
 print '\toplocks = %s' % configRegistry.get('samba/oplocks', 'yes')
 print '\tlarge readwrite = %s' % configRegistry.get('samba/large_readwrite', 'yes')
@@ -27,10 +27,16 @@ if configRegistry.get('samba4/service/smb', 'smbd') in ('smbd', 's3fs'):
 	print '\tstore dos attributes = %s' % configRegistry.get('samba/store_dos_attributes', 'yes')
 
 	if configRegistry.get('samba/min/protocol'):
-		print '\tmax protocol = %s' % configRegistry.get('samba/min/protocol')
+		print '\tserver min protocol = %s' % configRegistry.get('samba/min/protocol')
 
 	if configRegistry.get('samba/max/protocol'):
-		print '\tmax protocol = %s' % configRegistry.get('samba/max/protocol')
+		print '\tserver max protocol = %s' % configRegistry.get('samba/max/protocol')
+
+	if configRegistry.get('samba/client/min/protocol'):
+		print '\tclient min protocol = %s' % configRegistry.get('samba/client/min/protocol')
+
+	if configRegistry.get('samba/client/max/protocol'):
+		print '\tclient max protocol = %s' % configRegistry.get('samba/client/max/protocol')
 
 	if configRegistry['server/role'] != 'memberserver':
 		if ( not configRegistry['samba/homedirpath'] or configRegistry['samba/homedirpath']=='local') and configRegistry['samba/homedirserver'] and configRegistry['samba/homedirserver'] == 'local':

diff --git a/univention/templates/files/etc/samba/smb.conf.d/61univention-samba_misc b/univention/templates/files/etc/samba/smb.conf.d/61univention-samba_misc
index 4f4c891..d33ee4b 100644
--- a/univention/templates/files/etc/samba/smb.conf.d/61univention-samba_misc
+++ b/univention/templates/files/etc/samba/smb.conf.d/61univention-samba_misc
@@ -26,8 +26,17 @@ if configRegistry.get('samba4/service/smb', 'smbd') in ('smbd', 's3fs'):
 
 	print '\tstore dos attributes = %s' % configRegistry.get('samba/store_dos_attributes', 'yes')
 
-	if configRegistry.get('samba/max/protocol'):
-		print '\tmax protocol = %s' % configRegistry.get('samba/max/protocol')
+	if configRegistry.get('samba/client/min/protocol'):
+		print '\tclient min protocol = %s' % configRegistry.get('samba/client/min/protocol')
+
+	if configRegistry.get('samba/client/max/protocol'):
+		print '\tclient max protocol = %s' % configRegistry.get('samba/client/max/protocol')
+
+	if configRegistry.get('samba/server/min/protocol'):
+		print '\tserver min protocol = %s' % configRegistry.get('samba/server/min/protocol')
+
+	if configRegistry.get('samba/server/max/protocol'):
+		print '\tserver max protocol = %s' % configRegistry.get('samba/server/max/protocol')
 
 	if configRegistry['server/role'] != 'memberserver':
 		if ( not configRegistry['samba/homedirpath'] or configRegistry['samba/homedirpath']=='local') and configRegistry['samba/homedirserver'] and configRegistry['samba/homedirserver'] == 'local':