diff --git a/samba/manifests/init.pp b/samba/manifests/init.pp
index 3b12cb5..e8aedb6 100644
--- a/samba/manifests/init.pp
+++ b/samba/manifests/init.pp
@@ -102,7 +102,7 @@ class samba::domainmember {
         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'",
+        unless      => "net rpc testjoin -U ${samba_join_user}%\"\${SECRET}\"",
         require     => Service["smb"],
     }