diff --git a/irc/accounts.go b/irc/accounts.go
index d4ecd93c..bb33ef1e 100644
--- a/irc/accounts.go
+++ b/irc/accounts.go
@@ -1305,14 +1305,10 @@ func (am *AccountManager) Unregister(account string, erase bool) error {
 		delete(am.skeletonToAccount, additionalSkel)
 	}
 	for _, client := range clients {
-		if config.Accounts.RequireSasl.Enabled {
-			client.Logout()
-			client.Quit(client.t("You are no longer authorized to be on this server"), nil)
-			// destroy acquires a semaphore so we can't call it while holding a lock
-			go client.destroy(nil)
-		} else {
-			am.logoutOfAccount(client)
-		}
+		client.Logout()
+		client.Quit(client.t("You are no longer authorized to be on this server"), nil)
+		// destroy acquires a semaphore so we can't call it while holding a lock
+		go client.destroy(nil)
 	}
 
 	if err != nil && !erase {
diff --git a/irc/nickname.go b/irc/nickname.go
index 1adf0f55..bc396f79 100644
--- a/irc/nickname.go
+++ b/irc/nickname.go
@@ -17,8 +17,7 @@ import (
 
 var (
 	restrictedNicknames = []string{
-		"=scene=",  // used for rp commands
-		"HistServ", // used to play back JOIN, PART, etc. to legacy clients
+		"=scene=", // used for rp commands
 	}
 
 	restrictedCasefoldedNicks = make(map[string]bool)