diff --git a/canaille/app/forms.py b/canaille/app/forms.py
index b029cd37..801ccad1 100644
--- a/canaille/app/forms.py
+++ b/canaille/app/forms.py
@@ -98,12 +98,15 @@ def compromised_password_validator(form, field):
         api_url = (
             current_app.config["CANAILLE"]["API_URL_HIBP"] + hashed_password_prefix
         )
-        print(api_url)
 
         try:
             response = requests.api.get(api_url, timeout=10)
         except Exception:
-            check_if_send_mail_to_admins(form, api_url, hashed_password_suffix)
+            if not request_is_htmx():
+                current_app.logger.exception(
+                    "Password compromise investigation failed on HIBP API."
+                )
+                check_if_send_mail_to_admins(form, api_url, hashed_password_suffix)
             return None
 
         decoded_response = response.content.decode("utf8").split("\r\n")
diff --git a/canaille/app/mails_sending_conditions.py b/canaille/app/mails_sending_conditions.py
index 5aa78e58..92a5c132 100644
--- a/canaille/app/mails_sending_conditions.py
+++ b/canaille/app/mails_sending_conditions.py
@@ -4,15 +4,9 @@ from flask import flash
 from canaille.app.i18n import gettext as _
 from canaille.core.mails import send_compromised_password_check_failure_mail
 
-from .flask import request_is_htmx
-
 
 def check_if_send_mail_to_admins(form, api_url, hashed_password_suffix):
-    if current_app.features.has_smtp and not request_is_htmx():
-        current_app.logger.exception(
-            "Password compromise investigation failed on HIBP API."
-        )
-
+    if current_app.features.has_smtp:
         flash(
             _(
                 "Password compromise investigation failed. "
diff --git a/tests/app/test_forms.py b/tests/app/test_forms.py
index 93aa2d9c..45bcd92a 100644
--- a/tests/app/test_forms.py
+++ b/tests/app/test_forms.py
@@ -1,4 +1,5 @@
 import datetime
+import logging
 from unittest import mock
 
 import pytest
@@ -370,30 +371,8 @@ def test_compromised_password_validator(api_get, testclient):
 
 
 @mock.patch("requests.api.get")
-def test_compromised_password_validator_with_failure_of_api_request_and_no_SMTP_in_config(
-    api_get, testclient, logged_user
-):
-    current_app.config["CANAILLE"]["ENABLE_PASSWORD_COMPROMISSION_CHECK"] = True
-    api_get.side_effect = mock.Mock(side_effect=Exception())
-    current_app.config["CANAILLE"]["SMTP"] = None
-
-    class Field:
-        def __init__(self, data):
-            self.data = data
-
-    compromised_password_validator(None, Field("i'm a little pea"))
-    compromised_password_validator(None, Field("i'm a little chickpea"))
-    compromised_password_validator(None, Field("i'm singing in the rain"))
-    compromised_password_validator(None, Field("password"))
-    compromised_password_validator(None, Field("987654321"))
-    compromised_password_validator(None, Field("correct horse battery staple"))
-    compromised_password_validator(None, Field("zxcvbn123"))
-    compromised_password_validator(None, Field("azertyuiop123"))
-
-
-@mock.patch("requests.api.get")
-def test_compromised_password_validator_with_failure_of_api_request_and_only_with_htmx(
-    api_get, testclient, logged_user
+def test_compromised_password_validator_with_failure_of_api_request_without_form_validation(
+    api_get, testclient, logged_user, caplog
 ):
     current_app.config["CANAILLE"]["ENABLE_PASSWORD_COMPROMISSION_CHECK"] = True
     api_get.side_effect = mock.Mock(side_effect=Exception())
@@ -412,3 +391,9 @@ def test_compromised_password_validator_with_failure_of_api_request_and_only_wit
     )
 
     res.mustcontain('data-percent="100"')
+
+    assert (
+        "canaille",
+        logging.ERROR,
+        "Password compromise investigation failed on HIBP API.",
+    ) not in caplog.record_tuples