diff --git a/defaults/main.yml b/defaults/main.yml
index 3474923..76baa68 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -89,11 +89,11 @@ postfix_config:
   virtual_uid_maps: static:5000
 
 disclaimers_folder: /etc/mail/disclaimers
-database_username: mail_processor
+mailprocessor_database_username: mail_processor
 mailprocessor_database_userpass: ""
 mailprocessor_database_server: 127.0.0.1
 mailprocessor_database_server_port: 3306
 mailprocessor_database_socket_file: /var/run/mysqld/mysqld.sock # If this is set, port is not needed
 mailprocessor_log_file: /var/log/mail_processor.log
-default_text_disclaimer_file: /etc/main/default_text_disclaimer
-default_html_disclaimer_file: /etc/main/default_html_disclaimer
+default_text_disclaimer_file: /etc/postfix/default_text_disclaimer
+default_html_disclaimer_file: /etc/postfix/default_html_disclaimer