diff --git a/src/Config.py b/src/Config.py
index 038e2d9f..12e2c29b 100644
--- a/src/Config.py
+++ b/src/Config.py
@@ -10,7 +10,7 @@ class Config(object):
 
     def __init__(self, argv):
         self.version = "0.5.3"
-        self.rev = 2042
+        self.rev = 2043
         self.argv = argv
         self.action = None
         self.config_file = "zeronet.conf"
diff --git a/src/Ui/UiWebsocket.py b/src/Ui/UiWebsocket.py
index 86a68bd7..1a07e075 100644
--- a/src/Ui/UiWebsocket.py
+++ b/src/Ui/UiWebsocket.py
@@ -621,8 +621,9 @@ class UiWebsocket(object):
 
         # Add my certs
         auth_address = self.user.getAuthAddress(self.site.address)  # Current auth address
+        site_data = self.user.getSiteData(self.site.address)  # Current auth address
         for domain, cert in self.user.certs.items():
-            if auth_address == cert["auth_address"]:
+            if auth_address == cert["auth_address"] and domain == site_data.get("cert"):
                 active = domain
             title = cert["auth_user_name"] + "@" + domain
             if domain in accepted_domains or not accepted_domains or accept_any: