diff --git a/fiesta/apps/accounts/templates/account/login.html b/fiesta/apps/accounts/templates/account/login.html
index 40b99eab..567a22f2 100644
--- a/fiesta/apps/accounts/templates/account/login.html
+++ b/fiesta/apps/accounts/templates/account/login.html
@@ -36,13 +36,18 @@ <h1 class="card-title">{% trans "Log in" %}</h1>
                  type="checkbox"
                  class="w-4 h-4 bg-gray-50 rounded border border-gray-300 focus:ring-3 focus:ring-blue-300">
         </div>
-        <div class="ml-3 text-sm">
-          <label for="{{ form.remember.name }}" class="font-medium test-base-content">Remember me</label>
+        <div class="ml-3 link link-neutral link-hover">
+          <label for="{{ form.remember.name }}">Remember me</label>
         </div>
       </div>
       <a href="{% url 'account_reset_password' %}"
          class="link link-neutral link-hover text-base-content">Lost Password?</a>
     </div>
+
+    <div class="text-sm font-medium text-gray-500 inline-flex justify-between">
+      <span>Coming from <span class="text-secondary">fiesta.esncz.org</span>?</span>
+      <span>Use your original account to log in.</span>
+    </div>
     <button type="submit" class="btn btn-primary btn-block">Log in to your account</button>
     {# social accounts logins do have their own forms, so it cannot be nested #}
   </form>
diff --git a/fiesta/apps/accounts/templates/account/signup_form.html b/fiesta/apps/accounts/templates/account/signup_form.html
index 59b66e06..070dafd4 100644
--- a/fiesta/apps/accounts/templates/account/signup_form.html
+++ b/fiesta/apps/accounts/templates/account/signup_form.html
@@ -15,6 +15,10 @@ <h1 class="card-title">{{ card_title|default:"Create Account" }}</h1>
            value="{{ redirect_field_value }}" />
   {% endif %}
   <hr>
+  <div class="text-sm font-medium text-gray-500 inline-flex justify-between">
+    <span>Coming from <span class="text-secondary">fiesta.esncz.org</span>?</span>
+    <span>Use your original account to <a href="{{ login_url }}" class="link link-primary link-hover">log in</a>.</span>
+  </div>
   {% include "fiestaforms/parts/errors.html" with errors=form.non_field_errors %}
   {% include "fiestaforms/parts/field.html" with bf=form.email errors=form.errors.email %}
   {% include "fiestaforms/parts/field.html" with bf=form.password1 errors=form.errors.password1 %}
diff --git a/fiesta/fiesta/settings/auth.py b/fiesta/fiesta/settings/auth.py
index a9c1a8ca..d58c98c1 100644
--- a/fiesta/fiesta/settings/auth.py
+++ b/fiesta/fiesta/settings/auth.py
@@ -80,10 +80,15 @@ class AuthConfigMixin:
     # social account settings
     SOCIALACCOUNT_AUTO_SIGNUP = True  # after social login, do not enforce a signup form (only in case of conflict)
     SOCIALACCOUNT_ADAPTER = "apps.accounts.adapters.SocialAccountAdapter"
+
+    # trust providers when providing email and connect the account to the existing one
+    SOCIALACCOUNT_EMAIL_AUTHENTICATION = True
     # general django urls
     LOGIN_URL = "/auth/login"
     LOGIN_REDIRECT_URL = "/accounts/after-login"
 
     ACCOUNT_LOGIN_ON_PASSWORD_RESET = False  # do not autologin after password reset
+
     ACCOUNT_LOGOUT_ON_PASSWORD_CHANGE = True  # logout after password change
+
     ACCOUNT_USERNAME_MIN_LENGTH = 4  # a personal preference