diff --git a/include/znc/Client.h b/include/znc/Client.h
index c400de91..9f3c2155 100644
--- a/include/znc/Client.h
+++ b/include/znc/Client.h
@@ -116,7 +116,6 @@ class CClient : public CIRCSocket {
     bool HasCapNotify() const { return m_bCapNotify; }
     bool HasAwayNotify() const { return m_bAwayNotify; }
     bool HasAccountNotify() const { return m_bAccountNotify; }
-    bool HasAccountTag() const { return m_bAccountTag; }
     bool HasExtendedJoin() const { return m_bExtendedJoin; }
     bool HasNamesx() const { return m_bNamesx; }
     bool HasUHNames() const { return m_bUHNames; }
@@ -287,7 +286,6 @@ class CClient : public CIRCSocket {
     bool m_bCapNotify;
     bool m_bAwayNotify;
     bool m_bAccountNotify;
-    bool m_bAccountTag;
     bool m_bExtendedJoin;
     bool m_bNamesx;
     bool m_bUHNames;
diff --git a/include/znc/IRCSock.h b/include/znc/IRCSock.h
index 506c6527..ce93ceea 100644
--- a/include/znc/IRCSock.h
+++ b/include/znc/IRCSock.h
@@ -150,7 +150,6 @@ class CIRCSock : public CIRCSocket {
     bool HasUHNames() const { return m_bUHNames; }
     bool HasAwayNotify() const { return m_bAwayNotify; }
     bool HasAccountNotify() const { return m_bAccountNotify; }
-    bool HasAccountTag() const { return m_bAccountTag; }
     bool HasExtendedJoin() const { return m_bExtendedJoin; }
     bool HasServerTime() const { return m_bServerTime; }
     const std::set<char>& GetUserModes() const {
@@ -210,7 +209,6 @@ class CIRCSock : public CIRCSocket {
     bool m_bUHNames;
     bool m_bAwayNotify;
     bool m_bAccountNotify;
-    bool m_bAccountTag;
     bool m_bExtendedJoin;
     bool m_bServerTime;
     CString m_sPerms;
diff --git a/modules/corecaps.cpp b/modules/corecaps.cpp
index 7b7dce59..b74d91b6 100644
--- a/modules/corecaps.cpp
+++ b/modules/corecaps.cpp
@@ -46,12 +46,7 @@ class CCoreCaps : public CModule {
     };
 
     class AccountTag : public CCapability {
-        void OnServerChangedSupport(CIRCNetwork* pNetwork,
-                                    bool bState) override {
-            pNetwork->GetIRCSock()->m_bAccountTag = bState;
-        }
         void OnClientChangedSupport(CClient* pClient, bool bState) override {
-            pClient->m_bAccountTag = bState;
             pClient->SetTagSupport("account", bState);
         }
     };
diff --git a/src/Client.cpp b/src/Client.cpp
index ac2dd93f..d5aa8346 100644
--- a/src/Client.cpp
+++ b/src/Client.cpp
@@ -84,7 +84,6 @@ CClient::CClient() : CIRCSocket(),
       m_bCapNotify(false),
       m_bAwayNotify(false),
       m_bAccountNotify(false),
-      m_bAccountTag(false),
       m_bExtendedJoin(false),
       m_bNamesx(false),
       m_bUHNames(false),
diff --git a/src/IRCSock.cpp b/src/IRCSock.cpp
index e3473707..b7bcec00 100644
--- a/src/IRCSock.cpp
+++ b/src/IRCSock.cpp
@@ -67,7 +67,6 @@ CIRCSock::CIRCSock(CIRCNetwork* pNetwork)
       m_bUHNames(false),
       m_bAwayNotify(false),
       m_bAccountNotify(false),
-      m_bAccountTag(false),
       m_bExtendedJoin(false),
       m_bServerTime(false),
       m_sPerms("*!@%+"),