diff --git a/exposed-panels/totemomail-panel.yaml b/exposed-panels/totemomail-panel.yaml
index b9e30db6c45..fd84354c63e 100644
--- a/exposed-panels/totemomail-panel.yaml
+++ b/exposed-panels/totemomail-panel.yaml
@@ -1,7 +1,7 @@
 id: totemomail-panel
 
 info:
-  name: Totemomail login panel
+  name: Totemomail Login Panel
   author: johnk3r,daffainfo
   reference:
     - https://www.totemo.com/en/products/email-encryption
@@ -15,7 +15,9 @@ requests:
   - method: GET
     path:
       - "{{BaseURL}}/responsiveUI/"
+      - "{{BaseURL}}/responsiveUI/webmail/folder.xhtml"
 
+    stop-at-first-match: true
     matchers-condition: and
     matchers:
       - type: word
@@ -23,7 +25,8 @@ requests:
         words:
           - "/responsiveUI/javax.faces.resource/images/totemomail_logo.svg.xhtml"
           - "/responsiveUI/javax.faces.resource/css/custom.css.xhtml?con=totemo"
-        condition: and
+          - "<title>WebMail login: totemomail® WebMail</title>"
+        condition: or
 
       - type: status
         status: