diff --git a/manifests/client/config.pp b/manifests/client/config.pp
index b48553df7..5c4f497a3 100644
--- a/manifests/client/config.pp
+++ b/manifests/client/config.pp
@@ -1,9 +1,9 @@
-class ssh::client::config {
+class ssh::client::config inherits ssh { 
   file { $ssh::params::ssh_config:
     ensure  => present,
     owner   => 'root',
     group   => 'root',
-    source  => "puppet:///modules/${module_name}/ssh_config",
+    content => template("${module_name}/ssh_config.erb"),
     require => Class['ssh::client::install'],
   }
 
diff --git a/manifests/init.pp b/manifests/init.pp
index 5c9b1d653..fe0ea452a 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,4 +1,6 @@
-class ssh {
+class ssh (
+  $disable_user_known_hosts = true
+) {
   include ssh::server
   include ssh::client
 }
diff --git a/files/ssh_config b/templates/ssh_config.erb
similarity index 97%
rename from files/ssh_config
rename to templates/ssh_config.erb
index 43b298e11..4262d03be 100644
--- a/files/ssh_config
+++ b/templates/ssh_config.erb
@@ -51,4 +51,6 @@ Host *
     HashKnownHosts yes
     GSSAPIAuthentication yes
     GSSAPIDelegateCredentials no
+    <% if disable_user_known_hosts %>
     UserKnownHostsFile /dev/null
+    <% end %>