diff --git a/services/univention-samba/26univention-samba.inst b/services/univention-samba/26univention-samba.inst
index 1abe544ceb..dc1bf055f2 100755
--- a/services/univention-samba/26univention-samba.inst
+++ b/services/univention-samba/26univention-samba.inst
@@ -239,20 +239,20 @@ fi
 if [ "$server_role" = "domaincontroller_slave" -o "$samba_role" = "memberserver" ]; then
 	univention-config-registry set	samba/user="$ldap_hostdn" \
 									samba/user/pwdfile?"/etc/machine.secret"
-	smbpasswd -w $(cat /etc/machine.secret)
+	smbpasswd -w "$(cat /etc/machine.secret)"
 
 	echo "setting idmap secret for '*' from /etc/machine.secret"
-	net idmap set secret '*' $(cat /etc/machine.secret) 2>/dev/null
+	net idmap set secret '*' "$(cat /etc/machine.secret)" 2>/dev/null
 
 else
 	univention-config-registry set	samba/user?"cn=admin,$ldap_base" \
 									samba/user/pwdfile?"/etc/ldap.secret"
 	/etc/init.d/samba restart >/dev/null 2>&1
 
-	smbpasswd -w $(cat /etc/ldap.secret)
+	smbpasswd -w "$(cat /etc/ldap.secret)"
 
 	echo "setting idmap secret for '*' from /etc/ldap.secret"
-	net idmap set secret '*' $(cat /etc/ldap.secret) 2>/dev/null
+	net idmap set secret '*' "$(cat /etc/ldap.secret)" 2>/dev/null
 fi
 
 eval "$(univention-config-registry shell samba/user/pwdfile samba/user)"