diff --git a/manifests/get.pp b/manifests/get.pp
index a448124..1c8c395 100644
--- a/manifests/get.pp
+++ b/manifests/get.pp
@@ -55,13 +55,13 @@
 ) {
 
   if $keyfile {
-    $mykeyfile = $keyfile
+    $mykeyfile = "-i $keyfile"
   } else {
-    $mykeyfile = "/home/${user}/.ssh/id_rsa"
+    $mykeyfile = ""
   }
 
   if $user {
-    $myuser = "-e 'ssh -i ${mykeyfile} -l ${user}' ${user}@"
+    $myuser = "-e 'ssh ${mykeyfile} -l ${user}' ${user}@"
   } else {
     $myuser = undef
   }
diff --git a/manifests/put.pp b/manifests/put.pp
index bede4c7..7fd1d0e 100644
--- a/manifests/put.pp
+++ b/manifests/put.pp
@@ -40,13 +40,13 @@
 ) {
 
   if $keyfile {
-    $mykeyfile = $keyfile
+    $mykeyfile = "-i $keyfile"
   } else {
-    $mykeyfile = "/home/${user}/.ssh/id_rsa"
+    $mykeyfile = ""
   }
 
   if $user {
-    $myuseropt = "-e 'ssh -i ${mykeyfile} -l ${user}'"
+    $myuseropt = "-e 'ssh ${mykeyfile} -l ${user}'"
     $myuser = "${user}@"
   } else {
     $myuseropt = undef