diff --git a/bundles/icinga2/files/icinga2/users.conf b/bundles/icinga2/files/icinga2/users.conf
index 06441bd..b1ab301 100644
--- a/bundles/icinga2/files/icinga2/users.conf
+++ b/bundles/icinga2/files/icinga2/users.conf
@@ -1,5 +1,5 @@
 object UserGroup "on-call_sms" {
-    display_name = "On-Call Support"
+    display_name = "On-Call Support (with SMS)"
 }
 
 % for username, config in sorted(node.metadata.get('icinga2', {}).get('icinga_users', {}).items()):
@@ -7,8 +7,13 @@ object User "${username}" {
   display_name = "${username}"
   enable_notifications = true
   period = "24x7"
+% if config['is_admin']:
+  states = [ OK, Warning, Critical, Up, Down ]
+  types = [ Problem, Recovery, Custom, Acknowledgement ]
+% else:
   states = [ OK, Warning, Critical, Up, Down ]
   types = [ Problem, Recovery ]
+% endif
 
 % if config['is_admin'] and (config['email'] or config['phone']):
   groups = [ "on-call_sms" ]