diff --git a/sbin/configure_dm_webapp.sh b/sbin/configure_dm_webapp.sh
index 690335550375df8df56178c001d2a8a3252f8f92..ba8f145cbb188d3f1dda6301d9ff8e9db8400fb6 100755
--- a/sbin/configure_dm_webapp.sh
+++ b/sbin/configure_dm_webapp.sh
@@ -13,6 +13,7 @@ MY_DIR=`dirname $0` && cd $MY_DIR && MY_DIR=`pwd`
 if [ -z "${DM_ROOT_DIR}" ]; then
     DM_ROOT_DIR=$MY_DIR/..
 fi
+DM_INSTALL_DIR=${DM_INSTALL_DIR:=$DM_ROOT_DIR/..}
 DM_ENV_FILE=${DM_ROOT_DIR}/setup.sh
 if [ ! -f ${DM_ENV_FILE} ]; then
     echo "Environment file ${DM_ENV_FILE} does not exist." 
@@ -56,6 +57,12 @@ DM_DOMAIN=domain1
 echo "Copying db driver"
 rsync -ar $DM_ROOT_DIR/src/java/DmWebPortal/lib/postgresql-9.3-1102.jdbc41.jar $GLASSFISH_DIR/glassfish/domains/${DM_DOMAIN}/lib/ext
 
+# Check password from file
+passwordFile=$DM_INSTALL_DIR/etc/$DM_DB_NAME.db.passwd
+if [ -f $passwordFile ]; then
+    DM_DB_PASSWORD=`cat $passwordFile`
+fi
+
 # restart server
 echo "Restarting glassfish"
 $ASADMIN_CMD stop-domain ${DM_DOMAIN}
diff --git a/sbin/create_dm_db.sh b/sbin/create_dm_db.sh
index a521c1ceefe8283344d2d32237d8b2dc87115707..e2bd07b2ea316d5e465fa9befcc15136f8310611 100755
--- a/sbin/create_dm_db.sh
+++ b/sbin/create_dm_db.sh
@@ -27,7 +27,9 @@ cd $CURRENT_DIR
 if [ -z "${DM_ROOT_DIR}" ]; then
     DM_ROOT_DIR=$MY_DIR/..
 fi
+DM_INSTALL_DIR=${DM_INSTALL_DIR:=$DM_ROOT_DIR/..}
 DM_SQL_DIR=$DM_ROOT_DIR/db
+DM_ETC_DIR=$DM_INSTALL_DIR/etc
 DM_RUN_DIR=$DM_INSTALL_DIR/var/run
 DM_ENV_FILE=${DM_ROOT_DIR}/setup.sh
 if [ ! -f ${DM_ENV_FILE} ]; then
@@ -169,6 +171,13 @@ echo "Creating $DM_DB_USER"
 createDbUser $DM_DB_USER -E -d || exit 1
 modifyDbUserPassword $DM_DB_USER $DM_DB_USER_PASSWORD || exit 1
 
+# Create db password file
+mkdir -p $DM_ETC_DIR
+mkdir -p $DM_RUN_DIR
+passwordFile=$DM_ETC_DIR/$DM_DB_NAME.db.passwd
+echo $DM_DB_USER_PASSWORD > $passwordFile
+chmod 600 $passwordFile
+
 # Create db
 echo "Creating database: $DM_DB_NAME"
 createDb || exit 1