diff --git a/manifests/jenkinsuser.pp b/manifests/jenkinsuser.pp
index 56eb174..8f2366e 100644
--- a/manifests/jenkinsuser.pp
+++ b/manifests/jenkinsuser.pp
@@ -1,7 +1,7 @@
 # == Class: jenkins::jenkinsuser
 #
 class jenkins::jenkinsuser(
-  $ssh_key,
+  $ssh_key = undef,
   $ensure = present,
   $gitfullname = 'OpenStack Jenkins',
   $gitemail = 'jenkins@openstack.org',
@@ -58,14 +58,15 @@ class jenkins::jenkinsuser(
     require => File['/home/jenkins'],
   }
 
-  # cleanup old content in directory
-  file { '/home/jenkins/.ssh/authorized_keys':
-    ensure  => 'file',
-    owner   => 'jenkins',
-    group   => 'jenkins',
-    mode    => '0600',
-    content => template('jenkins/authorized_keys.erb'),
-    require => File['/home/jenkins/.ssh'],
+  if $ssh_key != undef {
+    file { '/home/jenkins/.ssh/authorized_keys':
+      ensure  => 'file',
+      owner   => 'jenkins',
+      group   => 'jenkins',
+      mode    => '0600',
+      content => template('jenkins/authorized_keys.erb'),
+      require => File['/home/jenkins/.ssh'],
+    }
   }
 
   if $gerritkey != undef {
diff --git a/manifests/slave.pp b/manifests/slave.pp
index bfcddcc..4a1f792 100644
--- a/manifests/slave.pp
+++ b/manifests/slave.pp
@@ -1,7 +1,7 @@
 # == Class: jenkins::slave
 #
 class jenkins::slave(
-  $ssh_key,
+  $ssh_key = undef,
   $user = true,
   $gitfullname = 'OpenStack Jenkins',
   $gitemail = 'jenkins@openstack.org',