diff --git a/roles/mail/tasks/main.yml b/roles/mail/tasks/main.yml
index 7eead6c..41e710d 100644
--- a/roles/mail/tasks/main.yml
+++ b/roles/mail/tasks/main.yml
@@ -134,7 +134,7 @@
   become_user: postgres
 
 - name: Configure PostgreSQL database for mailman3-web
-  postgresql_db: name={{ mailman3web_dbname }} owner={{ mailman3_db_user }}
+  postgresql_db: name={{ mailman3web_dbname }} owner={{ mailman3_dbuser }}
   become: true
   become_user: postgres
 
diff --git a/roles/mail/templates/mailman/mailman-web.py.j2 b/roles/mail/templates/mailman/mailman-web.py.j2
index a5b0c0e..0dba851 100644
--- a/roles/mail/templates/mailman/mailman-web.py.j2
+++ b/roles/mail/templates/mailman/mailman-web.py.j2
@@ -76,7 +76,7 @@ DATABASES = {
         'NAME': '{{ mailman3web_dbname }}',
 	# The following settings are not used with sqlite3:
         'USER': '{{ mailman3_dbuser }}',
-        'PASSWORD': '{{{ mailman3_dbpass }}',
+        'PASSWORD': '{{ mailman3_dbpass }}',
         # HOST: empty for localhost through domain sockets or '127.0.0.1' for
         # localhost through TCP.
         'HOST': 'localhost',