diff --git a/dba/appuser_permissions.txt b/dba/appuser_permissions.txt
index 5c8d5b4d..09f212e4 100644
--- a/dba/appuser_permissions.txt
+++ b/dba/appuser_permissions.txt
@@ -30,6 +30,10 @@ GRANT SELECT,INSERT,UPDATE,DELETE
   ON role_member
   ON session
   ON tmp_password
+  ON dav_resource
+  ON group_member
+  ON principal
+  ON privilege
 
 GRANT SELECT,UPDATE
   ON caldav_data_dav_id_seq
@@ -38,6 +42,9 @@ GRANT SELECT,UPDATE
   ON usr_user_no_seq
   ON roles_role_no_seq
   ON session_session_id_seq
+  ON dav_resource_type_resource_type_id_seq
+  ON principal_principal_id_seq
+  ON principal_type_principal_type_id_seq
 
 GRANT SELECT,INSERT
   ON time_zone
@@ -46,3 +53,6 @@ GRANT SELECT
   ON supported_locales
   ON awl_db_revision
   ON relationship_type
+  ON dav_resource_type
+  ON principal_type
+
diff --git a/dba/create-database.sh b/dba/create-database.sh
index cd6b4d8a..f19c85d4 100755
--- a/dba/create-database.sh
+++ b/dba/create-database.sh
@@ -43,7 +43,7 @@ create_db_user() {
 }
 
 create_plpgsql_language() {
-  if ! psql -qAt template1 -c "SELECT lanname FROM pg_language;" | grep "^plpgsql$" >/dev/null; then
+  if ! psql -U ${AWL_DBAUSER} -qAt template1 -c "SELECT lanname FROM pg_language;" | grep "^plpgsql$" >/dev/null; then
     createlang plpgsql "${DBNAME}"
   fi
 }
@@ -61,12 +61,12 @@ create_plpgsql_language
 
 #
 # Load the AWL base tables and schema management tables
-psql -q -f "${AWLDIR}/dba/awl-tables.sql" "${DBNAME}" 2>&1 | egrep -v "(^CREATE |^GRANT|^BEGIN|^COMMIT| NOTICE: )"
-psql -q -f "${AWLDIR}/dba/schema-management.sql" "${DBNAME}" 2>&1 | egrep -v "(^CREATE |^GRANT|^BEGIN|^COMMIT| NOTICE: )"
+psql -q -U "${AWL_DBAUSER}" -f "${AWLDIR}/dba/awl-tables.sql" "${DBNAME}" 2>&1 | egrep -v "(^CREATE |^GRANT|^BEGIN|^COMMIT| NOTICE: )"
+psql -q -U "${AWL_DBAUSER}" -f "${AWLDIR}/dba/schema-management.sql" "${DBNAME}" 2>&1 | egrep -v "(^CREATE |^GRANT|^BEGIN|^COMMIT| NOTICE: )"
 
 #
 # Load the DAViCal tables
-psql -q -f "${DBADIR}/davical.sql" "${DBNAME}" 2>&1 | egrep -v "(^CREATE |^GRANT|^BEGIN|^COMMIT| NOTICE: )"
+psql -q -U "${AWL_DBAUSER}" -f "${DBADIR}/davical.sql" "${DBNAME}" 2>&1 | egrep -v "(^CREATE |^GRANT|^BEGIN|^COMMIT| NOTICE: )"
 
 #
 # Set permissions for the application DB user on the database
@@ -74,7 +74,7 @@ ${DBADIR}/update-rscds-database --dbname "${DBNAME}" --appuser "${AWL_APPUSER}"
 
 #
 # Load the required base data
-psql -q -f "${DBADIR}/base-data.sql" "${DBNAME}"
+psql -q -U "${AWL_DBAUSER}" -f "${DBADIR}/base-data.sql" "${DBNAME}"
 
 #
 # We can override the admin password generation for regression testing predictability