diff --git a/manifests/params.pp b/manifests/params.pp
index e50e3d5..1a704e4 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -102,13 +102,13 @@ class puppet_cd::params (
 
   # user settings
   ## puppet user
-  Boolean $pt_manage_user           = true,
+  Boolean $pt_manage_user           = false,
   String $pt_user                   = 'puppet',
   String $pt_user_comment           = 'puppetserver daemon',
   String $pt_user_home              = '/opt/puppetlabs/server/data/puppetserver',
   String $pt_user_shell             = '/sbin/nologin',
   ## puppetdb user
-  Boolean $pt_manage_db_user        = true,
+  Boolean $pt_manage_db_user        = false,
   String $pt_db_user                = 'puppetdb',
   String $pt_db_user_comment        = 'PuppetDB daemon',
   String $pt_db_user_home           = '/opt/puppetlabs/server/data/puppetdb',
diff --git a/manifests/puppetdb/dirs.pp b/manifests/puppetdb/dirs.pp
index a023923..8a0298e 100644
--- a/manifests/puppetdb/dirs.pp
+++ b/manifests/puppetdb/dirs.pp
@@ -6,7 +6,7 @@
 class puppet_cd::puppetdb::dirs (
 
 ) inherits puppet_cd::params {
-  if ($fqdn == $pt_puppetdb_server) and ($pt_use_puppetdb == true) {
+  if ($fqdn == $pt_db_fqdn) and ($pt_use_puppetdb == true) {
     require puppet_cd::main::install
 
     # main directory
diff --git a/manifests/puppetdb/files.pp b/manifests/puppetdb/files.pp
index a0ae43d..1e7b240 100644
--- a/manifests/puppetdb/files.pp
+++ b/manifests/puppetdb/files.pp
@@ -6,7 +6,7 @@
 class puppet_cd::puppetdb::files (
 
 ) inherits puppet_cd::params {
-  if ($fqdn == $pt_puppetdb_server) and ($pt_use_puppetdb == true) {
+  if ($fqdn == $pt_db_fqdn) and ($pt_use_puppetdb == true) {
     require puppet_cd::puppetdb::dirs
 
     # bootstrap.cfg