--- a/dev/modules/sysconfig/manifests/postgresql.pp	Sat Mar 01 09:48:26 2014 +0100
+++ b/dev/modules/sysconfig/manifests/postgresql.pp	Tue Mar 04 13:28:35 2014 +0100
@@ -12,9 +12,13 @@
     if $sysconfig::params::db_is_local {
         class { 'postgresql::server': }
 
-        postgresql::server::db { $db_name:
-            user     => $db_user,
-            password => postgresql_password($db_user, $db_pw),
+        postgresql::server::role {"${db_user}_createdb":
+            username      => $db_user,
+            createdb      => true,
+            password_hash => postgresql_password($db_user, $db_pw)
+        }->
+        postgresql::server::database { $db_name:
+            owner    => $db_user,            
             encoding => 'UTF8',
         }
     }