diff --git a/BTCPayServer.Tests/SeleniumTester.cs b/BTCPayServer.Tests/SeleniumTester.cs
index d4d442536..8f988d00d 100644
--- a/BTCPayServer.Tests/SeleniumTester.cs
+++ b/BTCPayServer.Tests/SeleniumTester.cs
@@ -99,9 +99,7 @@ namespace BTCPayServer.Tests
 
         public string RegisterNewUser(bool isAdmin = false)
         {
-            GoToHome();
-            if (Driver.PageSource.Contains("id=\"Logout\""))
-                Logout();
+            EnsureLogout();
             var usr = RandomUtils.GetUInt256().ToString().Substring(20) + "@a.com";
             Driver.FindElement(By.Id("Register")).Click();
             Driver.FindElement(By.Id("Email")).SendKeys(usr);
@@ -114,6 +112,13 @@ namespace BTCPayServer.Tests
             return usr;
         }
 
+        private void EnsureLogout()
+        {
+            GoToHome();
+            if (Driver.PageSource.Contains("id=\"Logout\""))
+                Logout();
+        }
+
         public (string storeName, string storeId) CreateNewStore()
         {
             var usr = "Store" + RandomUtils.GetUInt64().ToString();
@@ -205,10 +210,10 @@ namespace BTCPayServer.Tests
 
         public void Login(string user, string password)
         {
+            EnsureLogout();
             Driver.FindElement(By.Id("Email")).SendKeys(user);
             Driver.FindElement(By.Id("Password")).SendKeys(password);
             Driver.FindElement(By.Id("LoginButton")).Click();
-
         }
 
         public void GoToStore(string storeId, StoreNavPages storeNavPage = StoreNavPages.Index)