From d679d21ac031d5f12edc638ace5084e1b9150076 Mon Sep 17 00:00:00 2001
From: Shivaram Lingamneni <slingamn@cs.stanford.edu>
Date: Sun, 26 Jul 2020 04:10:28 -0400
Subject: [PATCH] fix #1216

---
 irc/accounts.go | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/irc/accounts.go b/irc/accounts.go
index 26b8dbe7..65a70bca 100644
--- a/irc/accounts.go
+++ b/irc/accounts.go
@@ -903,6 +903,23 @@ func (am *AccountManager) Verify(client *Client, account string, code string) er
 			am.server.RandomlyRename(currentClient)
 		}
 	}
+	// #1216: we may have created an always-on client
+	if client == nil {
+		config := am.server.Config()
+		if persistenceEnabled(config.Accounts.Multiclient.AlwaysOn, PersistentUnspecified) {
+			accountData, err := am.LoadAccount(account)
+			if err != nil {
+				return err
+			}
+			am.server.AddAlwaysOnClient(
+				accountData,
+				nil,
+				nil,
+				config.Accounts.defaultUserModes,
+				"",
+			)
+		}
+	}
 	return nil
 }