diff --git a/registration_thread.cpp b/registration_thread.cpp
index 2d1f4c7..6c2c1dd 100644
--- a/registration_thread.cpp
+++ b/registration_thread.cpp
@@ -38,20 +38,19 @@ auto RegistrationThread::send_req() -> void
 {
     std::string request;
     char const* const want[] = {
-        "extended-join",
         "account-notify",
-        "draft/chathistory",
-        "batch",
-        "soju.im/no-implicit-names",
-        "chghost",
-        "setname",
         "account-tag",
-        "solanum.chat/oper",
-        "solanum.chat/identify-msg",
-        "solanum.chat/realhost",
-        "server-time",
+        "batch",
+        "chghost",
+        "draft/chathistory",
+        "extended-join",
         "invite-notify",
-        "extended-join"
+        "server-time",
+        "setname",
+        "soju.im/no-implicit-names",
+        "solanum.chat/identify-msg",
+        "solanum.chat/oper",
+        "solanum.chat/realhost",
     };
 
     for (auto cap : want)
diff --git a/snote_thread.cpp b/snote_thread.cpp
index 5ccc3db..033f518 100644
--- a/snote_thread.cpp
+++ b/snote_thread.cpp
@@ -71,6 +71,9 @@ SnotePattern const patterns[] =
 
     {SnoteTag::Killed,
      R"(^Received KILL message for ([^ ]+)!([^ ]+)@([^ ]+)\. From ([^ ]+) Path: ([^ ]+) \((.*)\)$)"},
+
+    {SnoteTag::TooManyGlobalConnections,
+     R"(^Too many global connections for ([^ ]+)\[([^ ]+)@([^ ]+)\] \[(.*)\]$)"},
 };
 
 auto setup_database() -> hs_database_t*
diff --git a/snote_thread.hpp b/snote_thread.hpp
index 0bf759f..0841bba 100644
--- a/snote_thread.hpp
+++ b/snote_thread.hpp
@@ -26,6 +26,7 @@ enum class SnoteTag
     LoginAttempts,
     PossibleFlooder,
     Killed,
+    TooManyGlobalConnections,
 };
 
 class SnoteEvent : public Event