diff --git a/Changes b/Changes
index 3e9c970548..3fe4eaff88 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,8 @@
 This file documents the revision history for the Monitoring Webinterface Thruk.
 
 next:
+          - DEPRECATION WARNING: gaining admin role from system_commands and configuration_information role
+            is deprecated now and will be removed in the future.
           - improve display of large byte numbers in human perf data table
           - Rest
             - add comments_info / downtimes_info to /r/hosts and /r/services
diff --git a/docs/documentation/cgi-cfg.asciidoc b/docs/documentation/cgi-cfg.asciidoc
index fb05fc5117..333dca03ef 100644
--- a/docs/documentation/cgi-cfg.asciidoc
+++ b/docs/documentation/cgi-cfg.asciidoc
@@ -114,6 +114,9 @@ ex.:
 
   authorized_for_admin = thrukadmin
 
+Note: For historical reasons, any use which has the `authorized_for_system_information` and the `authorized_for_configuration_information` role will also gain the admin role.
+This is considered deprecated and might change in the future.
+
 
 === authorized_for_system_information
 List of usernames who have access to the system and process