diff --git a/irc/accounts.go b/irc/accounts.go
index 0012d385..ce18984b 100644
--- a/irc/accounts.go
+++ b/irc/accounts.go
@@ -378,6 +378,9 @@ func (am *AccountManager) Register(client *Client, account string, callbackNames
 			tx.Set(registeredTimeKey, registeredTimeStr, setOptions)
 			tx.Set(credentialsKey, credStr, setOptions)
 			tx.Set(callbackKey, callbackSpec, setOptions)
+			if certfp != "" {
+				tx.Set(certFPKey, casefoldedAccount, setOptions)
+			}
 			return nil
 		})
 	}()