diff --git a/cyrus/manifests/init.pp b/cyrus/manifests/init.pp
index f7fba6f..ac17729 100644
--- a/cyrus/manifests/init.pp
+++ b/cyrus/manifests/init.pp
@@ -6,6 +6,8 @@
 #   $cyrus_cert:
 #       Path to SSL certificate. Defaults to puppet client certificate.
 #
+#   $cyrus_admins:
+#       List of users "user1 user2", which have admin rights on the IMAP server.
 class cyrus {
 
     case $::operatingsystem {
@@ -25,6 +27,10 @@ class cyrus {
         $postfix_cert = "${puppet_ssldir}/certs/${homename}.pem"
     }
 
+    if !$cyrus_admins {
+        $cyrus_admins = "admin"
+    }
+
     package { [
     	"cyrus-imapd-2.4",
     	"cyrus-clients-2.4",
diff --git a/cyrus/templates/imapd.conf.erb b/cyrus/templates/imapd.conf.erb
index d8decb1..d7243ff 100644
--- a/cyrus/templates/imapd.conf.erb
+++ b/cyrus/templates/imapd.conf.erb
@@ -53,7 +53,7 @@ lmtp_downcase_rcpt: yes
 
 # Uncomment the following and add the space-separated users who 
 # have admin rights for all services.
-#admins: cyrus
+admins: <%= cyrus_admins %>
 
 # Space-separated list of users that have lmtp "admin" status (i.e. that
 # can deliver email through TCP/IP lmtp). If specified, this parameter