diff --git a/manifests/client/user.pp b/manifests/client/user.pp
index 1e9ae53..33cca46 100644
--- a/manifests/client/user.pp
+++ b/manifests/client/user.pp
@@ -39,7 +39,11 @@
   ## Get Key for remote backup user
   if $push_ssh_key {
     $server_user_exploded = "${server_user}@${server}"
-    $backup_server_ip = inline_template("<%= Addrinfo.getaddrinfo('${server}', 'ssh', nil, :STREAM).first.ip_address %>")
+    if is_ip_address($server) {
+      $backup_server_ip = $server
+    } else {
+      $backup_server_ip = inline_template("<%= Addrinfo.getaddrinfo('${server}', 'ssh', nil, :STREAM).first.ip_address %>")
+    }
     sshkeys::set_authorized_key { "${server_user_exploded} to ${client_user}":
       local_user  => $client_user,
       remote_user => $server_user_exploded,
diff --git a/metadata.json b/metadata.json
index bd495c5..e50d7ba 100644
--- a/metadata.json
+++ b/metadata.json
@@ -24,6 +24,10 @@
       "name": "saz/sudo",
       "version_requirement": "< 4.0.0"
     }
+    {
+      "name": "puppetlabs-stdlib",
+      "version_requirement": "< 2.2.0"
+    },
   ],
   "operatingsystem_support": [
     { "operatingsystem": "Debian", "operatingsystemrelease": ["6", "7"]},