diff --git a/http/exposed-panels/oracle-opera-login.yaml b/http/exposed-panels/oracle-opera-login.yaml
index 35f6804ed1..d7cda41fe9 100644
--- a/http/exposed-panels/oracle-opera-login.yaml
+++ b/http/exposed-panels/oracle-opera-login.yaml
@@ -1,30 +1,34 @@
 id: oracle-opera-login
 
 info:
-  name: Oracle Opera - Login
-  author: DhiyaneshDK
+  name: Oracle Opera Login - Detect
+  author: DhiyaneshDK,righettod
   severity: info
   classification:
     cwe-id: CWE-200
   metadata:
     max-request: 1
     verified: true
-    shodan-query: title:"Oracle Opera"
+    shodan-query: title:"Oracle Opera" && html:"/OperaLogin/Welcome.do"
   tags: panel,opera,oracle,detect
 
 http:
   - method: GET
     path:
       - "{{BaseURL}}"
+      - "{{BaseURL}}/OperaLogin/Welcome.do"
 
     host-redirects: true
     max-redirects: 2
+    stop-at-first-match: true
     matchers-condition: and
     matchers:
       - type: word
         part: body
         words:
           - '<title>Oracle, OPERA</title>'
+          - '<title>OPERA Login'
+        condition: or
 
       - type: status
         status: