diff --git a/samba/manifests/init.pp b/samba/manifests/init.pp
index 9a192a1..4b2cf69 100644
--- a/samba/manifests/init.pp
+++ b/samba/manifests/init.pp
@@ -82,11 +82,12 @@ class samba::domainmember {
     include samba::server
 
     exec { "net join":
-        command => "net join -U ${samba_join_user}%'${samba_join_pass}'",
-        path    => "/bin:/usr/bin:/sbin:/usr/sbin",
-        onlyif  => "rpcclient localhost -c 'srvinfo' -U root%'' 2>&1 | grep 'NT_STATUS_CANT_ACCESS_DOMAIN_INFO'",
-        require => [ Package["samba"],
-                     File["/etc/samba/smb.conf"], ],
+        command     => "net join -U ${samba_join_user}%\"\${SECRET}\"",
+        environment => "SECRET=${samba_join_pass}",
+        path        => "/bin:/usr/bin:/sbin:/usr/sbin",
+        onlyif      => "rpcclient localhost -c 'srvinfo' -U root%'' 2>&1 | grep 'NT_STATUS_CANT_ACCESS_DOMAIN_INFO'",
+        require     => [ Package["samba"],
+                         File["/etc/samba/smb.conf"], ],
     }
 
 }