diff --git a/manifests/puppet.pp b/manifests/puppet.pp
index 0aadbf80..3181a59e 100644
--- a/manifests/puppet.pp
+++ b/manifests/puppet.pp
@@ -44,9 +44,10 @@
       key_pair => $::certs::server_ca,
     } ~>
     file { $client_key:
-      ensure => file,
-      owner  => '52',
-      mode   => '0400',
+      ensure  => file,
+      owner   => 'puppet',
+      mode    => '0400',
+      require => Class['puppet::server::install'],
     }
 
   }