diff --git a/spec/classes/postfix_spec.rb b/spec/classes/postfix_spec.rb
index 2d98aacc025c94261bb9a15c74c5aaec901505a2..a52756f9caf2fb664a639151eb55cc74f6c2cf20 100644
--- a/spec/classes/postfix_spec.rb
+++ b/spec/classes/postfix_spec.rb
@@ -106,6 +106,8 @@ describe 'postfix' do
             /schleuder/
           ).with_content(
             /sympa/
+          ).with_content(
+            /user=bar/
           )
         }
         it { should contain_file('/etc/postfix/main.cf').without('seltype') }
diff --git a/templates/master.cf.debian.erb b/templates/master.cf.debian.erb
index b0d8261d88224d4a7e42214cd163db0f780b74a7..aadcc286b90d39b363ebd60d5ae5c9fa95314078 100644
--- a/templates/master.cf.debian.erb
+++ b/templates/master.cf.debian.erb
@@ -68,7 +68,7 @@ scache	  unix	-	-	-	-	1	scache
 # Also specify in main.cf: maildrop_destination_recipient_limit=1
 #
 maildrop  unix  -       n       n       -       -       pipe
-  flags=DRhu user=<%= scope.lookupvar('postfix::mail_user') %> argv=/usr/bin/maildrop -d ${recipient}
+  flags=DRhu user=<%= @mail_user %> argv=/usr/bin/maildrop -d ${recipient}
 #
 # See the Postfix UUCP_README file for configuration details.
 #