diff --git a/services/swh-web/entrypoint.sh b/services/swh-web/entrypoint.sh
index 44f5cd3..8a4961a 100755
--- a/services/swh-web/entrypoint.sh
+++ b/services/swh-web/entrypoint.sh
@@ -1,25 +1,38 @@
 #!/bin/bash
 
 set -e
 
+create_admin_script="
+from django.contrib.auth import get_user_model;
+
+username = 'admin';
+password = 'admin';
+email = 'admin@swh-web.org';
+
+User = get_user_model();
+
+if not User.objects.filter(username = username).exists():
+    User.objects.create_superuser(username, email, password);
+"
+
 source /srv/softwareheritage/utils/pyutils.sh
 setup_pip
 
 case "$1" in
     "shell")
         exec bash -i
         ;;
      *)
         echo "Migrating db using ${DJANGO_SETTINGS_MODULE}"
         django-admin migrate --settings=${DJANGO_SETTINGS_MODULE}
 
         echo "Creating admin user"
-        echo "from django.contrib.auth import get_user_model; User = get_user_model(); User.objects.create_superuser('admin', 'admin@swh-web.org', 'admin')" | python3 -m swh.web.manage shell || true
+        echo "$create_admin_script" | python3 -m swh.web.manage shell
 
         echo "starting the swh-web server"
         exec gunicorn --bind 0.0.0.0:5004 \
              --threads 2 \
              --workers 2 \
              --timeout 3600 \
              swh.web.wsgi
 esac