diff --git a/exposed-panels/rundeck-login.yaml b/exposed-panels/rundeck-login.yaml
index b3ddda4290..ffba8fda77 100644
--- a/exposed-panels/rundeck-login.yaml
+++ b/exposed-panels/rundeck-login.yaml
@@ -1,8 +1,8 @@
 id: rundeck-login
 
 info:
-  name: RunDeck Login
-  author: DhiyaneshDk
+  name: RunDeck Login Panel
+  author: DhiyaneshDk, daffainfo
   severity: info
   metadata:
     verified: true
@@ -16,14 +16,24 @@ requests:
 
     host-redirects: true
     max-redirects: 2
-    matchers-condition: or
+    matchers-condition: and
     matchers:
       - type: word
         part: body
         words:
-          - 'Rundeck - Login</title>'
+          - 'utm_source=rundeckapp'
+          - 'name="j_username" id="login"'
+          - 'name="j_password" id="password"'
+        condition: and
 
-      - type: word
+      - type: status
+        status:
+          - 200
+
+    extractors:
+      - type: regex
         part: body
-        words:
-          - 'RUNDECK ENTERPRISE - Login</title>'
+        group: 1
+        regex:
+          - '<a href=\"https:\/\/docs.rundeck.com\/([0-9.]+)'
+          - '<a href=\"http:\/\/rundeck\.org\/([0-9.]+)' ## Detection version on old rundeck