diff --git a/src/Ui/UiWebsocket.py b/src/Ui/UiWebsocket.py
index 26a78129..1816df05 100644
--- a/src/Ui/UiWebsocket.py
+++ b/src/Ui/UiWebsocket.py
@@ -721,7 +721,7 @@ class UiWebsocket(object):
             body += "<div style='background-color: #F7F7F7; margin-right: -30px'>"
             for domain in more_domains:
                 body += _(u"""
-                 <a href='/{domain}' onclick='wrapper.gotoSite(this)' class='select'>
+                 <a href='/{domain}' onclick='zeroframe.certSelectGotoSite(this)' class='select'>
                   <small style='float: right; margin-right: 40px; margin-top: -1px'>{_[Register]} &raquo;</small>{domain}
                  </a>
                 """)
@@ -731,16 +731,14 @@ class UiWebsocket(object):
             <script>
              $(".notification .select.cert").on("click", function() {
                 $(".notification .select").removeClass('active')
-                wrapper.ws.cmd('certSet', [this.title], function() {
-                    wrapper.sendInner({"cmd": "response", "to": %s, "result": this.title})
-                })
+                zeroframe.response(%s, this.title)
                 return false
              })
             </script>
-        """ % to
+        """ % self.next_message_id
 
         # Send the notification
-        self.cmd("notification", ["ask", body])
+        self.cmd("notification", ["ask", body], lambda domain: self.actionCertSet(to, domain))
 
     # - Admin actions -