diff --git a/exposed-panels/drupal-login.yaml b/exposed-panels/drupal-login.yaml
new file mode 100644
index 0000000000..d36180c3a9
--- /dev/null
+++ b/exposed-panels/drupal-login.yaml
@@ -0,0 +1,30 @@
+id: drupal-login
+
+info:
+  name: Drupal login
+  author: pathtaga
+  severity: info
+  tags: panel,drupal
+
+requests:
+  - method: GET
+    path:
+      - "{{BaseURL}}"
+      - "{{BaseURL}}/user/login"
+
+    stop-at-first-match: true
+    matchers-condition: or
+    matchers:
+      - type: regex
+        part: body
+        regex:
+          - '<(?:link|style)[^>]+"/sites/(?:default|all)/(?:themes|modules)/'
+          - '<[^>]+(?:id="block[_-]commerce[_-]cart[_-]cart|class="commerce[_-]product[_-]field)'
+        condition: or
+
+      - type: regex
+        part: header
+        regex:
+          - '(?i)x-drupal'
+          - "(?i)x-generator: drupal"
+        condition: or
diff --git a/technologies/tech-detect.yaml b/technologies/tech-detect.yaml
index 5fede91bec..70d61da226 100644
--- a/technologies/tech-detect.yaml
+++ b/technologies/tech-detect.yaml
@@ -2095,17 +2095,6 @@ requests:
         condition: or
         part: body
 
-      - type: regex
-        name: drupal
-        part: all
-        regex:
-          - <(?:link|style)[^>]+"/sites/(?:default|all)/(?:themes|modules)/
-          - <[^>]+(?:id="block[_-]commerce[_-]cart[_-]cart|class="commerce[_-]product[_-]field)
-          - "X-Drupal"
-          - "x-drupal"
-          - "X-Generator: Drupal"
-        condition: or
-
       - type: regex
         name: webxpay
         regex: