diff --git a/http/exposed-panels/strapi-panel.yaml b/http/exposed-panels/strapi-panel.yaml
index ea4c49cbe52..33f06180620 100644
--- a/http/exposed-panels/strapi-panel.yaml
+++ b/http/exposed-panels/strapi-panel.yaml
@@ -1,32 +1,35 @@
 id: strapi-panel
 
 info:
-  name: Strapi Admin Login Panel - Detect
-  author: idealphase
+  name: Strapi Login Panel - Detect
+  author: idealphase,righettod
   severity: info
-  description: Strapi admin login panel was detected.
+  description: |
+    Strapi login panel was detected.
+  reference:
+    - https://github.com/strapi/strapi
+    - https://strapi.io/
   classification:
     cvss-metrics: CVSS:3.0/AV:N/AC:L/PR:N/UI:N/S:U/C:N/I:N/A:N
     cwe-id: CWE-200
     cpe: cpe:2.3:a:strapi:strapi:*:*:*:*:node.js:*:*:*
   metadata:
-    max-request: 1
+    max-request: 2
     vendor: strapi
     product: strapi
+    shodan-query: http.title:"strapi"
   tags: panel,strapi,login
 
 http:
   - method: GET
     path:
       - '{{BaseURL}}/admin/auth/login'
+      - '{{BaseURL}}/admin/plugins/users-permissions/auth/login'
 
-    matchers-condition: and
+    stop-at-first-match: true
     matchers:
-      - type: word
-        words:
-          - "<title>Strapi Admin</title>"
-
-      - type: status
-        status:
-          - 200
-# digest: 490a0046304402204fa852608b758c09d643f875052abcf70c002105243ce235aed4b2037ebe548e022068123924dfc04550a7d66815b555602772f6ea78bdca0413f4e2279efacb1943:922c64590222798bb761d5b6d8e72950
\ No newline at end of file
+      - type: dsl
+        dsl:
+          - 'status_code == 200'
+          - 'contains_any(to_lower(body), "<title>strapi admin</title>", "<title>welcome to your strapi app</title>")'
+        condition: and