diff --git a/lib/reducers/keyserver-reducer.js b/lib/reducers/keyserver-reducer.js
--- a/lib/reducers/keyserver-reducer.js
+++ b/lib/reducers/keyserver-reducer.js
@@ -15,6 +15,8 @@
 } from '../actions/keyserver-actions.js';
 import { siweAuthActionTypes } from '../actions/siwe-actions.js';
 import {
+  identityLogInActionTypes,
+  identityRegisterActionTypes,
   keyserverAuthActionTypes,
   logOutActionTypes,
   deleteKeyserverAccountActionTypes,
@@ -436,7 +438,10 @@
     };
   } else if (
     action.type === logOutActionTypes.success ||
-    action.type === deleteAccountActionTypes.success
+    action.type === deleteAccountActionTypes.success ||
+    action.type === identityRegisterActionTypes.success ||
+    (action.type === identityLogInActionTypes.success &&
+      action.payload.userID !== action.payload.preRequestUserState?.id)
   ) {
     // We want to remove all keyservers but Ashoat's keyserver
     const oldConnection =