diff --git a/manifests/database.pp b/manifests/database.pp
index db389d02..f7f4a26c 100644
--- a/manifests/database.pp
+++ b/manifests/database.pp
@@ -5,7 +5,7 @@
     include postgresql::client
     include postgresql::server
     postgresql::server::db { $pulpcore::postgresql_db_name:
-      user     => $pulpcore::user,
+      user     => $pulpcore::postgresql_db_user,
       password => postgresql_password($pulpcore::user, $pulpcore::postgresql_db_password),
       before   => Pulpcore::Admin['migrate --noinput'],
     }
diff --git a/manifests/init.pp b/manifests/init.pp
index 7a46ba17..0adb77d7 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -36,6 +36,9 @@
 # @param postgresql_db_name
 #   Name of Pulp database
 #
+# @param postgresql_db_user
+#   Pulp database user
+#
 # @param postgresql_db_password
 #   Password of Pulp database
 #
@@ -75,6 +78,7 @@
   Stdlib::Port $content_port = 24816,
   Stdlib::Absolutepath $webserver_static_dir = '/var/lib/pulp/docroot',
   String $postgresql_db_name = 'pulpcore',
+  String $postgresql_db_user = 'pulp',
   String $postgresql_db_password = extlib::cache_data('pulpcore_cache_data', 'db_password', extlib::random_password(32)),
   Stdlib::Host $postgresql_db_host = 'localhost',
   Stdlib::Port $postgresql_db_port = 5432,
diff --git a/spec/acceptance/basic_spec.rb b/spec/acceptance/basic_spec.rb
index 9fa2d7b5..0f920c4f 100644
--- a/spec/acceptance/basic_spec.rb
+++ b/spec/acceptance/basic_spec.rb
@@ -16,7 +16,9 @@ class { 'postgresql::globals':
     class { 'redis::globals':
       scl => 'rh-redis5',
     }
-    include pulpcore
+    class { 'pulpcore':
+      postgresql_db_user => 'pulp',
+    }
     PUPPET
   }
 
diff --git a/templates/settings.py.erb b/templates/settings.py.erb
index df463681..aeeb7df7 100644
--- a/templates/settings.py.erb
+++ b/templates/settings.py.erb
@@ -5,7 +5,7 @@ DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql',
         'NAME': '<%= scope['pulpcore::postgresql_db_name'] %>',
-        'USER': '<%= scope['pulpcore::user'] %>',
+        'USER': '<%= scope['pulpcore::postgresql_db_user'] %>',
         'PASSWORD': '<%= scope['pulpcore::postgresql_db_password'] %>',
         'HOST': '<%= scope['pulpcore::postgresql_db_host'] %>',
         'PORT': '<%= scope['pulpcore::postgresql_db_port'] %>',