diff --git a/Content.Server/Administration/AdminManager.cs b/Content.Server/Administration/AdminManager.cs
index 119405c289..28c5f93c30 100644
--- a/Content.Server/Administration/AdminManager.cs
+++ b/Content.Server/Administration/AdminManager.cs
@@ -203,6 +203,11 @@ namespace Content.Server.Administration
             else if (e.NewStatus == SessionStatus.Disconnected)
             {
                 _admins.Remove(e.Session);
+
+                if (_cfg.GetCVar(CCVars.AdminAnnounceLogout))
+                {
+                    _chat.SendAdminAnnouncement(Loc.GetString("Admin logout: {0}", e.Session.Name));
+                }
             }
         }
 
@@ -274,6 +279,11 @@ namespace Content.Server.Administration
             if (!session.ContentData()!.ExplicitlyDeadminned)
             {
                 reg.Data.Active = true;
+
+                if (_cfg.GetCVar(CCVars.AdminAnnounceLogin))
+                {
+                    _chat.SendAdminAnnouncement(Loc.GetString("Admin login: {0}", session.Name));
+                }
             }
 
             UpdateAdminStatus(session);
diff --git a/Content.Shared/CCVars.cs b/Content.Shared/CCVars.cs
index 02d58f26bd..a7e2a79879 100644
--- a/Content.Shared/CCVars.cs
+++ b/Content.Shared/CCVars.cs
@@ -62,5 +62,15 @@ namespace Content.Shared
 
         public static readonly CVarDef<string> DatabasePgPassword =
             CVarDef.Create("database.pg_password", "", CVar.SERVERONLY);
+
+        /*
+         * Admin stuff
+         */
+
+        public static readonly CVarDef<bool> AdminAnnounceLogin =
+            CVarDef.Create("admin.announce_login", true, CVar.SERVERONLY);
+
+        public static readonly CVarDef<bool> AdminAnnounceLogout =
+            CVarDef.Create("admin.announce_logout", true, CVar.SERVERONLY);
     }
 }