diff --git a/aidants_connect_web/forms.py b/aidants_connect_web/forms.py
index 05ef057b9..d03861408 100644
--- a/aidants_connect_web/forms.py
+++ b/aidants_connect_web/forms.py
@@ -8,6 +8,7 @@
 from django.utils.translation import gettext_lazy as _
 
 from django_otp import match_token
+from magicauth.forms import EmailForm as MagicAuthEmailForm
 from phonenumber_field.formfields import PhoneNumberField
 from phonenumber_field.widgets import PhoneNumberInternationalFallbackWidget
 
@@ -138,6 +139,20 @@ def clean(self):
         return cleaned_data
 
 
+class LoginEmailForm(MagicAuthEmailForm):
+    email = forms.EmailField()
+
+    def clean_email(self):
+        user_email = super().clean_email()
+        if not Aidant.objects.filter(email=user_email, is_active=True).exists():
+            raise ValidationError(
+                "Votre compte existe mais il n’est pas encore actif. "
+                "Si vous pensez que c’est une erreur, prenez contact avec votre "
+                "responsable ou avec Aidants Connect."
+            )
+        return user_email
+
+
 class MandatForm(forms.Form):
     DEMARCHES = [(key, value) for key, value in settings.DEMARCHES.items()]
     demarche = forms.MultipleChoiceField(
diff --git a/aidants_connect_web/tests/test_functional/test_view_autorisations.py b/aidants_connect_web/tests/test_functional/test_view_autorisations.py
index 0a3df1ce7..62ce2c5a8 100644
--- a/aidants_connect_web/tests/test_functional/test_view_autorisations.py
+++ b/aidants_connect_web/tests/test_functional/test_view_autorisations.py
@@ -18,7 +18,7 @@
 @tag("functional")
 class ViewAutorisationsTests(FunctionalTestCase):
     def setUp(self):
-        self.aidant = AidantFactory(email="thierry@thierry.com")
+        self.aidant = AidantFactory(username="thierry@thierry.com")
         device = self.aidant.staticdevice_set.create(id=self.aidant.id)
         device.token_set.create(token="123456")
 
diff --git a/aidants_connect_web/tests/test_views/test_login.py b/aidants_connect_web/tests/test_views/test_login.py
new file mode 100644
index 000000000..f611625d4
--- /dev/null
+++ b/aidants_connect_web/tests/test_views/test_login.py
@@ -0,0 +1,25 @@
+from django.core import mail
+from django.test import TestCase, tag
+from django.test.client import Client
+
+from aidants_connect_web.tests.factories import AidantFactory
+
+
+@tag("usagers")
+class LoginTests(TestCase):
+    @classmethod
+    def setUpTestData(cls):
+        cls.client = Client()
+        cls.aidant = AidantFactory(is_active=False, post__with_otp_device=True)
+
+    def test_inactive_aidant_with_valid_totp_cannot_login(self):
+        response = self.client.post(
+            "/accounts/login/", {"email": self.aidant.email, "otp_token": "123456"}
+        )
+        self.assertEqual(response.status_code, 200)
+        # Check explicit message is displayed
+        self.assertContains(
+            response, "Votre compte existe mais il n’est pas encore actif."
+        )
+        # Check no email was sent
+        self.assertEqual(len(mail.outbox), 0)
diff --git a/aidants_connect_web/urls.py b/aidants_connect_web/urls.py
index 86345c27b..ee6fb7d7b 100644
--- a/aidants_connect_web/urls.py
+++ b/aidants_connect_web/urls.py
@@ -1,6 +1,5 @@
 from django.urls import path
 
-from magicauth import views as magicauth_views
 from magicauth.urls import urlpatterns as magicauth_urls
 
 from aidants_connect_web.views import (
@@ -9,6 +8,7 @@
     espace_aidant,
     espace_responsable,
     id_provider,
+    login,
     mandat,
     renew_mandat,
     service,
@@ -17,7 +17,7 @@
 
 urlpatterns = [
     # service
-    path("accounts/login/", magicauth_views.LoginView.as_view(), name="login"),
+    path("accounts/login/", login.LoginView.as_view(), name="login"),
     path("logout-session/", service.logout_page, name="logout"),
     path("activity_check/", service.activity_check, name="activity_check"),
     # espace aidant : home, organisation
diff --git a/aidants_connect_web/views/login.py b/aidants_connect_web/views/login.py
new file mode 100644
index 000000000..240ae14c6
--- /dev/null
+++ b/aidants_connect_web/views/login.py
@@ -0,0 +1,7 @@
+from magicauth import views as magicauth_views
+
+from aidants_connect_web.forms import LoginEmailForm
+
+
+class LoginView(magicauth_views.LoginView):
+    form_class = LoginEmailForm