diff --git a/defaults/main.yml b/defaults/main.yml
index 1d0c086..26a927c 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -35,7 +35,6 @@ mailserver_mailman_domains:
 mailserver_roundcubemail_enabled: true
 mailserver_roundcubemail_domain: ""
 mailserver_roundcubemail_enabled_installer: false
-mailserver_roundcubemail_db_create_schema: false # run once with true
 mailserver_roundcubemail_db_type: "pgsql"
 mailserver_roundcubemail_db_host: "localhost"
 mailserver_roundcubemail_db_name: "roundcubemail"
diff --git a/tasks/roundcubemail.yml b/tasks/roundcubemail.yml
index b35f117..8260e65 100644
--- a/tasks/roundcubemail.yml
+++ b/tasks/roundcubemail.yml
@@ -10,6 +10,7 @@
     password: "{{ mailserver_roundcubemail_db_password }}"
 
 - name: roundcubemail - create database
+  register: mailserver_roundcubemail_db_create
   postgresql_db:
     login_host: "{{ mailserver_roundcubemail_db_host }}"
     name: "{{ mailserver_roundcubemail_db_name }}"
@@ -19,8 +20,9 @@
     lc_ctype: en_US.UTF-8
 
 
+# TODO maybe notify
 - name: roundcubemail - create tables
-  when: mailserver_roundcubemail_db_create_schema
+  when: mailserver_roundcubemail_db_create.changed
   postgresql_query:
     login_host: "{{ mailserver_roundcubemail_db_host }}"
     login_user: "{{ mailserver_roundcubemail_db_user }}"