diff --git a/bookwyrm/templates/ostatus/ostatus_error.html b/bookwyrm/templates/ostatus/error.html
similarity index 71%
rename from bookwyrm/templates/ostatus/ostatus_error.html
rename to bookwyrm/templates/ostatus/error.html
index de2ba988..b6e858e2 100644
--- a/bookwyrm/templates/ostatus/ostatus_error.html
+++ b/bookwyrm/templates/ostatus/error.html
@@ -29,10 +29,22 @@
 
   </div>
     {% elif error == 'ostatus_subscribe' %}
-    <div class="notification is-warning">
+    <div class="notification is-warning has-text-centered">
         <p>{% blocktrans %}Something went wrong trying to follow <strong>{{ account }}</strong>{% endblocktrans %}</p>
         <p>{% trans 'Check you have the correct username before trying again.' %}</p>
     </div>
+    {% elif error == 'is_blocked' %}
+    <div class="notification is-danger has-text-centered">
+        <p>{% blocktrans %}You have blocked <strong>{{ account }}</strong>{% endblocktrans %}</p>
+    </div>
+    {% elif error == 'already_following' %}
+    <div class="notification is-success has-text-centered">
+        <p>{% blocktrans %}You are already following <strong>{{ account }}</strong>{% endblocktrans %}</p>
+    </div>
+    {% elif error == 'already_requested' %}
+    <div class="notification is-success has-text-centered">
+        <p>{% blocktrans %}You have already requested to follow <strong>{{ account }}</strong>{% endblocktrans %}</p>
+    </div>
     {% endif %}
 </div>
 {% endblock %}
diff --git a/bookwyrm/templates/ostatus/ostatus_subscribe.html b/bookwyrm/templates/ostatus/subscribe.html
similarity index 86%
rename from bookwyrm/templates/ostatus/ostatus_subscribe.html
rename to bookwyrm/templates/ostatus/subscribe.html
index 9d87d8ef..e64be602 100644
--- a/bookwyrm/templates/ostatus/ostatus_subscribe.html
+++ b/bookwyrm/templates/ostatus/subscribe.html
@@ -25,7 +25,7 @@
 
 {% block content %}
 {% if error or not request.user.is_authenticated %}
-    {% include 'ostatus/ostatus_error.html' with error=error user=user account=account %}
+    {% include 'ostatus/error.html' with error=error user=user account=account %}
 {% else %}
 <div class="block card">
     <div class="card-content">
@@ -45,13 +45,14 @@
                     </span>
                     <span class="subtitle is-7 is-block">@{{ user|username }}</span>
                 </a>
-                <form name="follow" method="post" action="">
+                <form name="follow" method="post" action="{% url 'follow' %}/?next={% url 'ostatus-success' %}?following={{ user.username }}">
                   {% csrf_token %}
+                  <input name="user" value={{ user.username }} hidden>
                   <button class="button is-link" type="submit">{% trans "Follow " %} {{ user.name }}</button>
                 </form>
             </div>
         </div>
-        <div class="">
+        <div>
         {% if user.summary %}
             {{ user.summary|to_markdown|safe|truncatechars_html:120 }}
         {% else %}&nbsp;{% endif %}
diff --git a/bookwyrm/templates/ostatus/success.html b/bookwyrm/templates/ostatus/success.html
new file mode 100644
index 00000000..10b4409f
--- /dev/null
+++ b/bookwyrm/templates/ostatus/success.html
@@ -0,0 +1,32 @@
+{% extends 'ostatus/template.html' %}
+{% load i18n %}
+{% load utilities %}
+
+{% block content %}
+<div class="block card">
+  <div class="card-content">
+      <div class="media">
+          <a href="{{ user.local_path }}" class="media-left">
+              {% include 'snippets/avatar.html' with user=user large=True %}
+          </a>
+          <div class="media-content">
+              <a href="{{ user.local_path }}" class="is-block mb-2">
+                  <span class="title is-4 is-block">
+                      {{ user.display_name }}
+                      {% if user.manually_approves_followers %}
+                      <span class="icon icon-lock is-size-7" title="{% trans 'Locked account' %}">
+                          <span class="is-sr-only">{% trans "Locked account" %}</span>
+                      </span>
+                      {% endif %}
+                  </span>
+                  <span class="subtitle is-7 is-block">@{{ user|username }}</span>
+              </a>
+          </div>
+          <!-- TODO: this shoudl be a big tick instead -->
+          <a href="{{ user.local_path }}" class="media-left">
+            {% include 'snippets/avatar.html' with user=user large=True %}
+        </a>
+      </div>
+    </div>
+</div>
+{% endblock %}