diff --git a/defaults/main.yml b/defaults/main.yml
index d12950b..eb43a18 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,10 +1,11 @@
 ---
-mailserver_postfixadmin_domain: ""
 mailserver_db_type: "pgsql"
 mailserver_db_host: "localhost"
 mailserver_db_name: "mailserver"
 mailserver_db_user: "mailserver"
 mailserver_db_password: "{{ lookup('password', 'credentials/' + inventory_hostname + '/mailserver/db_password length=15') }}"
+#mailserver_postfixadmin_setup_password: "" # after postfixadmin-setup
+mailserver_postfixadmin_domain: ""
 mailserver_postfixadmin_mail_domain: "sum7.eu"
 mailserver_postfixadmin_mail_admin: "admin@{{ mailserver_postfixadmin_mail_domain }}"
 mailserver_postfixadmin_setup: ""
diff --git a/templates/postfixadmin.local.php b/templates/postfixadmin.local.php
index bd224e0..63decb5 100644
--- a/templates/postfixadmin.local.php
+++ b/templates/postfixadmin.local.php
@@ -1,6 +1,10 @@
 <?php
 
 $CONF['configured'] = true;
+{% if mailserver_postfixadmin_setup_password is defined %}
+$CONF['setup_password'] = '{{ mailserver_postfixadmin_setup_password }}';
+{% endif %}
+
 
 $CONF['database_type'] = '{{ mailserver_db_type }}';
 $CONF['database_host'] = '{{ mailserver_db_host }}';