diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index ee99821812adbdb0ab1c466a1b877f38955e5ced..0228a06877e996b49e422e28cdb9dc36b6c926d3 100644
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -28,7 +28,7 @@ define backupninja::rdiff(
   $backuptag = false)
 {
   $real_backuptag = $backuptag ? {
-      false => $fqdn,
+      false => $host,
       default => $backuptag
   }
 
@@ -40,7 +40,7 @@ define backupninja::rdiff(
       
       backupninja::server::sandbox
       {
-        "${user}-${name}": user => $user, host => $host, dir => $home,
+        "${user}-${name}": user => $user, host => $fqdn, dir => $home,
         manage_ssh_dir => $ssh_dir_manage, ssh_dir => $ssh_dir, key => $key,
         authorized_keys_file => $authorized_keys_file, installuser => $installuser,
         backuptag => $real_backuptag