diff --git a/defaults/main.yml b/defaults/main.yml
index e474893..b7b2b1b 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -8,6 +8,7 @@ nextcloud:
   mail:
     from: www-data
     domain: localhost
+    server: ~
   admin:
     pw: "{{ lookup('password', '/dev/null') }}"
     name: admin
diff --git a/tasks/main.yml b/tasks/main.yml
index 0af7a4d..d56b0c3 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -41,8 +41,10 @@
   - { key: "mail_domain",       value: "{{ nextcloud.mail.domain }}" }
   - { key: "mail_smtpmode",     value: "smtp" }
   - { key: "mail_smtpauthtype", value: "PLAIN" }
-  - { key: "mail_smtphost",     value: "{{ mail.server }}" }
+  - { key: "mail_smtphost",     value: "{{ nextcloud.mail.server }}" }
   - { key: "mail_smtpport",     value: "25" }
+  - { key: "mail_smtppassword", value: "{{ nextcloud.mail.password }}" }
+  - { key: "mail_smtpname",     value: "{{ nextcloud.mail.user }}" }
   - { key: "memcache.local",    value: '{{ "\OC\Memcache\APCu" }}' }
   - { key: "datadirectory",     value: "{{ nextcloud.datadir }}" }