diff --git a/shared/locale/en/LC_MESSAGES/django.mo b/shared/locale/en/LC_MESSAGES/django.mo
index 230a608..12a8392 100644
Binary files a/shared/locale/en/LC_MESSAGES/django.mo and b/shared/locale/en/LC_MESSAGES/django.mo differ
diff --git a/shared/locale/en/LC_MESSAGES/django.po b/shared/locale/en/LC_MESSAGES/django.po
index dd0d733..4cdfdbc 100644
--- a/shared/locale/en/LC_MESSAGES/django.po
+++ b/shared/locale/en/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-20 17:09+0100\n"
-"PO-Revision-Date: 2021-12-20 17:18+0100\n"
+"POT-Creation-Date: 2021-12-20 20:08+0100\n"
+"PO-Revision-Date: 2021-12-20 20:10+0100\n"
 "Last-Translator: Test Translator <test@translator>\n"
 "Language-Team: \n"
 "Language: en\n"
@@ -405,7 +405,7 @@ msgstr "Add a question"
 #: shared/templates/auth/create-user.html:32
 #: shared/templates/auth/election_login.html:34
 #: shared/templates/auth/permission-management.html:38
-#: shared/templates/authens/pwd_login.html:34
+#: shared/templates/authens/pwd_login.html:47
 #: shared/templates/authens/pwd_reset.html:34
 #: shared/templates/forms/common-form.html:25
 msgid "Retour"
@@ -573,7 +573,7 @@ msgstr "Vote for the question:"
 #: shared/templates/auth/create-user.html:23
 #: shared/templates/auth/election_login.html:25
 #: shared/templates/auth/permission-management.html:29
-#: shared/templates/authens/pwd_login.html:25
+#: shared/templates/authens/pwd_login.html:38
 #: shared/templates/authens/pwd_reset_confirm.html:25
 #: shared/templates/forms/modal-form.html:24
 msgid "Enregistrer"
@@ -915,11 +915,20 @@ msgstr ""
 msgid "Choisissez la méthode de connexion"
 msgstr "Choose the connection method"
 
-#: shared/templates/authens/pwd_login.html:42
+#: shared/templates/authens/login_switch.html:47
+#: shared/templates/authens/pwd_login.html:21
+msgid ""
+"La connexion par identifiants reçus par mail pour un vote particulier se "
+"fera directement sur la page du vote lorsqu'il sera ouvert."
+msgstr ""
+"Logging in using the credentials received by e-mail for a specific vote will "
+"be done directly on the voting page when it is opened."
+
+#: shared/templates/authens/pwd_login.html:55
 msgid "Mot de passe oublié :"
 msgstr "Forgotten password:"
 
-#: shared/templates/authens/pwd_login.html:48
+#: shared/templates/authens/pwd_login.html:61
 msgid "Réinitialiser mon mot de passe."
 msgstr "Reset my password."
 
diff --git a/shared/templates/authens/login_switch.html b/shared/templates/authens/login_switch.html
index 522f067..184ce8c 100644
--- a/shared/templates/authens/login_switch.html
+++ b/shared/templates/authens/login_switch.html
@@ -37,4 +37,17 @@
   </div>
 </div>
 
+<div class="tile is-ancestor pt-6">
+  <div class="tile is-parent">
+    <div class="tile is-child notification is-warning">
+      <div class="has-text-centered">
+        <span class="icon">
+          <i class="fas fa-exclamation-triangle"></i>
+        </span>
+        <span>{% trans "La connexion par identifiants reçus par mail pour un vote particulier se fera directement sur la page du vote lorsqu'il sera ouvert." %}</span>
+      </div>
+    </div>
+  </div>
+</div>
+
 {% endblock %}
diff --git a/shared/templates/authens/pwd_login.html b/shared/templates/authens/pwd_login.html
index b9c22d6..2e0cc9c 100644
--- a/shared/templates/authens/pwd_login.html
+++ b/shared/templates/authens/pwd_login.html
@@ -11,7 +11,20 @@
 
 <div class="columns is-centered">
   <div class="column is-two-thirds">
-    <form action="" method="post">
+    <div class="tile is-ancestor">
+      <div class="tile is-parent">
+        <div class="tile is-child notification is-warning">
+          <div class="has-text-centered">
+            <span class="icon">
+              <i class="fas fa-exclamation-triangle"></i>
+            </span>
+            <span>{% trans "La connexion par identifiants reçus par mail pour un vote particulier se fera directement sur la page du vote lorsqu'il sera ouvert." %}</span>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <form class="pt-4" method="post">
       {% csrf_token %}
 
       {% include "forms/form.html" with errors=True %}
diff --git a/shared/templates/forms/form.html b/shared/templates/forms/form.html
index 0ab9f16..1159714 100644
--- a/shared/templates/forms/form.html
+++ b/shared/templates/forms/form.html
@@ -1,11 +1,10 @@
 {% if errors %}
 {% if form.non_field_errors %}
-<div class="message is-danger">
-  <div class="message-body">
-    {% for non_field_error in form.non_field_errors %}
-    {{ non_field_error }}
-    {% endfor %}
-  </div>
+<div class="notification is-danger px-3 has-text-centered">
+  {% for non_field_error in form.non_field_errors %}
+  {{ non_field_error }}
+  {% if not forloop.last %}<hr>{% endif %}
+  {% endfor %}
 </div>
 {% endif %}
 {% endif %}