diff --git a/lib/configfiles/gentoo.inc.php b/lib/configfiles/gentoo.inc.php
index 3e2041a6..8f2e63a5 100644
--- a/lib/configfiles/gentoo.inc.php
+++ b/lib/configfiles/gentoo.inc.php
@@ -130,7 +130,7 @@ return Array(
 						'label' => 'Postfix/Dovecot',
 						'commands_1' => Array(
 							'echo "mail-mta/postfix dovecot-sasl -sasl" >> /etc/portage/package.use',
-              'emerge -av postfix',
+              				'emerge -av postfix',
 							'mkdir -p ' . $settings['system']['vmail_homedir'],
 							'chown -R vmail:vmail ' . $settings['system']['vmail_homedir'],
 							'chmod 0750 ' . $settings['system']['vmail_homedir'],
diff --git a/templates/misc/configfiles/gentoo/dovecot/etc_dovecot_dovecot.conf b/templates/misc/configfiles/gentoo/dovecot/etc_dovecot_dovecot.conf
index e2ec3240..64f3dd17 100644
--- a/templates/misc/configfiles/gentoo/dovecot/etc_dovecot_dovecot.conf
+++ b/templates/misc/configfiles/gentoo/dovecot/etc_dovecot_dovecot.conf
@@ -27,7 +27,7 @@ protocol pop3 {
 }
 protocol lda {
 	# postmaster is the one in charge of the mail system. MUST be set to a valid address!
-    postmaster_address = <postmaster-address>
+    postmaster_address = admin@<SERVERNAME>
     auth_socket_path = /var/run/dovecot/auth-master
     mail_plugins = quota
     sendmail_path = /usr/sbin/sendmail