diff --git a/django_mailman3/templates/account/login.html b/django_mailman3/templates/account/login.html
index df8e7c7..1c03564 100644
--- a/django_mailman3/templates/account/login.html
+++ b/django_mailman3/templates/account/login.html
@@ -19,6 +19,17 @@
 of your existing third party accounts. Or, <a href="{{ signup_url }}">sign up</a>
 for a {{ site_name }} account and sign in below:{% endblocktrans %}</p>
 
+<p>{% blocktrans with site.name as site_name %}If you have a {{ site_name }}
+account that you haven't yet linked to any third party account, you must log
+in with your account's email address and password and once logged in, you can
+link your third party accounts via the Account Connections tab on your user
+profile page.{% endblocktrans %}</p>
+
+<p>{% blocktrans with site.name as site_name %}If you do not have a
+{{ site_name }} account but you have one of these third party accounts, you can
+create a {{ site_name }} account and sign in one step by clicking the third
+party account.{% endblocktrans %}</p>
+
 <div class="socialaccount_ballot">
 
   <ul class="socialaccount_providers list-inline">
diff --git a/django_mailman3/templates/account/signup.html b/django_mailman3/templates/account/signup.html
index fc5aedd..242b970 100644
--- a/django_mailman3/templates/account/signup.html
+++ b/django_mailman3/templates/account/signup.html
@@ -1,6 +1,7 @@
 {% extends "account/base.html" %}
 
 {% load i18n %}
+{% load account socialaccount %}
 {% load bootstrap_tags %}
 
 {% block head_title %}{% trans "Signup" %}{% endblock %}
@@ -10,6 +11,27 @@
 
 <p>{% blocktrans %}Already have an account? Then please <a href="{{ login_url }}">sign in</a>.{% endblocktrans %}</p>
 
+{% get_providers as socialaccount_providers %}
+
+{% if socialaccount_providers %}
+<p>{% blocktrans with site.name as site_name %}If you do not have a
+{{ site_name }} account but you have one of these third party accounts, you can
+create a {{ site_name }} account and sign in one step by clicking the third
+party account.{% endblocktrans %}</p>
+
+<div class="socialaccount_ballot">
+
+  <ul class="socialaccount_providers list-inline">
+    {% include "socialaccount/snippets/provider_list.html" with process="login" %}
+  </ul>
+
+  {% include "django_mailman3/login_extra_post_providers.html" %}
+
+  <div class="login-or">{% trans 'or' %}</div>
+
+</div>
+{% endif %}
+
 <form class="signup form-horizontal" id="signup_form" method="post" action="{% url 'account_signup' %}">
   {% bootstrap_form_horizontal form 3 4 %}
   {% if redirect_field_value %}