diff --git a/dba/create-database.sh b/dba/create-database.sh
index c035840d..48e22bd1 100755
--- a/dba/create-database.sh
+++ b/dba/create-database.sh
@@ -35,8 +35,8 @@ if [ -z "${AWLDIR}" ] ; then
     exit 1
 fi
 
-export AWL_DBAUSER=davical_dba
-export AWL_APPUSER=davical_app
+AWL_DBAUSER="${3:-davical_dba}"
+AWL_APPUSER="${4:-davical_app}"
 
 # set -x
 
diff --git a/dba/windows/create-database.bat b/dba/windows/create-database.bat
index fe23df4a..4f74c3dd 100644
--- a/dba/windows/create-database.bat
+++ b/dba/windows/create-database.bat
@@ -24,8 +24,8 @@ if EXIST %AWLDIR%\awl-tables.sql (
 )
 
 rem Set DB user, web user, DB config directory, Windows DB config directory
-set AWL_DBAUSER=davical_dba
-set AWL_APPUSER=davical_app
+set AWL_DBAUSER=%3-davical_dba
+set AWL_APPUSER=%4-davical_app
 set DBA=%AWL_DBAUSER%
 
 rem Need PostgreSQL location