diff --git a/02-sahana.sh b/02-sahana.sh
index 130d5c4..6ef84e7 100755
--- a/02-sahana.sh
+++ b/02-sahana.sh
@@ -30,9 +30,10 @@ mkdir /srv/sahana/applications/eden/{databases,errors,sessions}
 mkdir -p /srv/sahana/applications/eden/static/cache/chart
 mkdir -p /srv/sahana/applications/eden/uploads/{gis_cache,images,tracks}
 export SAHANA_HMAC=$(head -c 18 /dev/urandom | base64)
-export SAHANA_ADMIN_PWD=$(head -c 18 /dev/urandom | base64)
 envsubst <${SOURCE_DIR}/sahana/srv/sahana/applications/eden/models/000_config.py >/srv/sahana/applications/eden/models/000_config.py
 cp ${SOURCE_DIR}/sahana/srv/sahana/applications/eden/modules/templates/default/config.py /srv/sahana/applications/eden/modules/templates/default/config.py
+export SAHANA_ADMIN_USER=admin@example.com
+export SAHANA_ADMIN_PWD=$(head -c 18 /dev/urandom | base64)
 envsubst <${SOURCE_DIR}/sahana/srv/sahana/applications/eden/modules/templates/default/users/masterUsers.csv >/srv/sahana/applications/eden/modules/templates/default/users/masterUsers.csv
 cp ${SOURCE_DIR}/sahana/srv/sahana/applications/eden/languages/cz.py /srv/sahana/applications/eden/languages/cz.py
 
@@ -62,6 +63,9 @@ ln -s /etc/nginx/apps-available/sahana /etc/nginx/apps-enabled/sahana
 systemctl restart uwsgi
 systemctl restart nginx
 
+# Add portal application definition
+${SOURCE_DIR}/basic/portal-app-manager.py sahana-eden "https://{host}/eden/" "${SAHANA_ADMIN_USER}" "${SAHANA_ADMIN_PWD}"
+
 # TODO: Does matplotlib still require MPLCONFIGDIR directory?
 # If so, /srv/sahana/wsgihandler.py needs to be modified
 
diff --git a/10-seeddms.sh b/10-seeddms.sh
index 6cda00c..912e904 100755
--- a/10-seeddms.sh
+++ b/10-seeddms.sh
@@ -37,5 +37,8 @@ ln -s /etc/nginx/apps-available/seeddms /etc/nginx/apps-enabled/seeddms
 systemctl restart php7.0-fpm
 systemctl restart nginx
 
+# Add portal application definition
+${SOURCE_DIR}/basic/portal-app-manager.py seeddms "https://{host}/seeddms/"
+
 # TODO: id3 ssconvers pdftotext catdoc
 # TODO: Test Lucene fulltext search
diff --git a/50-pandora.sh b/50-pandora.sh
index c9dbe10..5dce809 100755
--- a/50-pandora.sh
+++ b/50-pandora.sh
@@ -65,3 +65,6 @@ for SERVICE in "pandora pandora-tasks pandora-encoding pandora-cron pandora-webs
     systemctl start ${SERVICE}
 done
 systemctl restart nginx
+
+# Add portal application definition
+${SOURCE_DIR}/basic/portal-app-manager.py pandora "https://{host}:8001/"
diff --git a/sahana/srv/sahana/applications/eden/modules/templates/default/users/masterUsers.csv b/sahana/srv/sahana/applications/eden/modules/templates/default/users/masterUsers.csv
index 32c75bd..dabe9f8 100644
--- a/sahana/srv/sahana/applications/eden/modules/templates/default/users/masterUsers.csv
+++ b/sahana/srv/sahana/applications/eden/modules/templates/default/users/masterUsers.csv
@@ -1,2 +1,2 @@
 First Name,Last Name,Email,Password,Role,Organisation
-Admin,User,admin@example.com,${SAHANA_ADMIN_PWD},ADMIN,
+Admin,User,${SAHANA_ADMIN_USER},${SAHANA_ADMIN_PWD},ADMIN,