diff --git a/ansible.yml b/ansible.yml
index cb694ad306ad9766e06be373417c64b7ecce8d4a..6aff86de67f8dfbe70297befcc83a16a7fa1e26f 100644
--- a/ansible.yml
+++ b/ansible.yml
@@ -88,6 +88,7 @@
       - { path: '/mnt/repo-base/config-dynamic/letsencrypt/autorenew', owner: root }
       - { path: '/mnt/repo-base/config-dynamic/nginx/sites-enabled', owner: root }
       - { path: '/mnt/repo-base/volumes/accounts/', owner: www-data }
+      - { path: '/mnt/repo-base/volumes/create-account/', owner: 900 }
 
   # NOTE: This does not delete files that have been deleted from the repo, need to do that manually.
   - name: copy static config files
diff --git a/group_vars/all b/group_vars/all
index 73572a6fb8dab9a7c99583aac634ea2868a101ba..951bca0b2b1bacf709941f7e92ec23bff7cc7303 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -1,4 +1,5 @@
 # MUST SPECIFY
+# TODO: need to do something about these variables so they are not committed to git
 domain: ""
 additional_domains: []
 contact_email: "<user-email>"
diff --git a/scripts/postinstall.sh b/scripts/postinstall.sh
index 94716e5c4bb17e7b9b009b5e343268446dc48cfe..ed373e4bd3150f7ed7cee6984233236ef28c7045 100755
--- a/scripts/postinstall.sh
+++ b/scripts/postinstall.sh
@@ -1,17 +1,15 @@
 #!/usr/bin/env bash
 set -ex
 
+# TODO: it looks like this script is executed twice when installing with ansible
+
 source /mnt/repo-base/scripts/base.sh
 
 echo -e "\nHack: restart everything to ensure that database and nextcloud are initialized"
 docker-compose restart
 
 printf "$(date): Waiting for Nextcloud to finish installation"
-# sleep for 300 seconds
-for i in {0..300}; do
-  sleep 1
-  printf "."
-done
+sleep 300
 
 # Create Nextcloud mysql database and user
 docker-compose exec -T mariadb mysql --user=root --password="$MYSQL_ROOT_PASSWORD" \
diff --git a/templates/docker-compose/01-docker-compose-base.yml b/templates/docker-compose/01-docker-compose-base.yml
index 4abf423b92395d7e7c3dd5ef23a14135cdd06cdb..27a9b1d0a54f5619581e03e015bb932a68f02c56 100644
--- a/templates/docker-compose/01-docker-compose-base.yml
+++ b/templates/docker-compose/01-docker-compose-base.yml
@@ -134,7 +134,7 @@ services:
       - /mnt/repo-base/config-dynamic/automx/automx.conf:/etc/automx.conf
 
   create-account:
-    image: registry.gitlab.e.foundation:5000/e/infra/docker-create-account:1.0.1
+    image: registry.gitlab.e.foundation:5000/e/infra/docker-create-account:1.1.0
     container_name: create-account
     restart: always
     environment:
@@ -143,6 +143,11 @@ services:
       - POSTFIXADMIN_SSH_PASSWORD=${POSTFIXADMIN_SSH_PASSWORD}
       - DOMAIN=${DOMAIN}
       - CREATE_ACCOUNT_PASSWORD=${CREATE_ACCOUNT_PASSWORD}
+      - SMTP_HOST=${SMTP_HOST}
+      - SMTP_FROM=${SMTP_FROM}
+      - SMTP_PASSWORD=${SMTP_PW}
+    volumes:
+      - /mnt/repo-base/volumes/create-account:/data
     networks:
       - serverbase
     depends_on:
diff --git a/templates/nginx/sites-enabled/nextcloud.conf b/templates/nginx/sites-enabled/nextcloud.conf
index 38e8dcc7223c34166cc5efad79d3f7c8d7fe22ab..39be267f2763e712017d2754dcd627c93ddf04bd 100644
--- a/templates/nginx/sites-enabled/nextcloud.conf
+++ b/templates/nginx/sites-enabled/nextcloud.conf
@@ -92,4 +92,7 @@ server {
         add_header Referrer-Policy no-referrer;
         access_log off;
     }
+    location ~ /(delete-account|delete-account-form|confirm-delete-account) {
+        proxy_pass http://create-account:9000;
+    }
 }