diff --git a/screening/dist/admin/env b/screening/dist/admin/env
index 74042676935491a0be191d78a7b9c74124dea0ab..9c54a0d18353bce37c1958c8d28e553ddd81e85a 100644
--- a/screening/dist/admin/env
+++ b/screening/dist/admin/env
@@ -1,6 +1,8 @@
 OPENBIS_DB=openbis_screening_mydb
 IMAGING_DB=imaging_mydb
 
+DB_USER_NAME=postgres
+
 # Unalias rm and cp commands
 alias cp='cp'
 alias rm='rm'
diff --git a/screening/dist/admin/reset-display-settings.sh b/screening/dist/admin/reset-display-settings.sh
index b5aaeeb796dd8280d3bd872fb745ac72e642365b..80db7a9dd44e983d5da9879734a16684874a24df 100755
--- a/screening/dist/admin/reset-display-settings.sh
+++ b/screening/dist/admin/reset-display-settings.sh
@@ -13,4 +13,4 @@ fi
 
 source $BASE/env
 
-psql -U postgres -d $OPENBIS_DB -c "update persons set display_settings = (select display_settings from persons where user_id = '$TEMPLATE_USER') where user_id != '$TEMPLATE_USER'"
+psql -U $DB_USER_NAME -d $OPENBIS_DB -c "update persons set display_settings = (select display_settings from persons where user_id = '$TEMPLATE_USER') where user_id != '$TEMPLATE_USER'"
diff --git a/screening/dist/admin/upgrade.sh b/screening/dist/admin/upgrade.sh
index ab9f64e2abfcebc2f301e0ab42242005d921f302..684aa9f7b664f5ebc8b573ea8644937976bb0a39 100755
--- a/screening/dist/admin/upgrade.sh
+++ b/screening/dist/admin/upgrade.sh
@@ -25,8 +25,8 @@ mv $ROOT_DIR/openBIS-server $OLD_BIS
 mv $ROOT_DIR/datastore_server $BACKUP_DIR/datastore_server-$NOW
 
 # pg_restore -d db-name db-file.dmp 
-pg_dump -U openbis -Fc $OPENBIS_DB > $BACKUP_DIR/$OPENBIS_DB-${NOW}.dmp
-pg_dump -U openbis -Fc $IMAGING_DB > $BACKUP_DIR/$IMAGING_DB-${NOW}.dmp
+pg_dump -U $DB_USER_NAME -Fc $OPENBIS_DB > $BACKUP_DIR/$OPENBIS_DB-${NOW}.dmp
+pg_dump -U $DB_USER_NAME -Fc $IMAGING_DB > $BACKUP_DIR/$IMAGING_DB-${NOW}.dmp
 
 echo Installing openBIS Datastore Server
 unzip $ROOT_DIR/datastore*.zip