diff --git a/docker-compose.yml b/docker-compose.yml
index 22f64e2..d68812a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -39,4 +39,4 @@ services:
 
 networks:
     intelmq-internal:
-        driver: bridge
\ No newline at end of file
+        driver: bridge
diff --git a/entrypoint.sh b/entrypoint.sh
index ea6efc3..cdcbf44 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -4,6 +4,10 @@ export INTELMQ_IS_DOCKER=1
 intelmqctl upgrade-config
 intelmqctl check
 
+intelmq_user=${INTELMQ_API_USER:-intelmq}
+intelmq_pass=${INTELMQ_API_PASS:-intelmq}
+intelmq-api-adduser --user $intelmq_user --pass $intelmq_pass
+
 if [[ $1 == "selftest" ]]
 then
     export INTELMQ_TEST_EXOTIC=1
diff --git a/intelmq_persistence/api-session.sqlite b/intelmq_persistence/api-session.sqlite
new file mode 100644
index 0000000..e69de29