diff --git a/bookwyrm/templates/get_started/layout.html b/bookwyrm/templates/get_started/layout.html
index 4d79dd0e..db8bce55 100644
--- a/bookwyrm/templates/get_started/layout.html
+++ b/bookwyrm/templates/get_started/layout.html
@@ -40,6 +40,8 @@
                 <span>{% trans "Skip this step" %}</span>
                 <span class="icon icon-arrow-right" aria-hidden="true"></span>
             </a>
+            {% else %}
+            <a href="/" class="button is-primary">{% trans "Finish" %}</a>
             {% endif %}
         </footer>
     </div>
diff --git a/bookwyrm/templates/get_started/profile.html b/bookwyrm/templates/get_started/profile.html
index 7ee43c08..9c31957f 100644
--- a/bookwyrm/templates/get_started/profile.html
+++ b/bookwyrm/templates/get_started/profile.html
@@ -51,7 +51,7 @@
             {% url 'directory' as path %}
             <p class="help">{% trans "Your account will show up in the directory, and may be recommended to other BookWyrm users." %}</p>
         </div>
-        <div class="block"><button class="button is-primary" type="submit">{% trans "Save" %}</button></div>
+        <div class="block"><button class="button is-primary" type="submit">{% trans "Save &amp; continue" %}</button></div>
     </form>
 </div>
 {% endblock %}
diff --git a/bookwyrm/templates/get_started/users.html b/bookwyrm/templates/get_started/users.html
index 14c04e63..28ab1913 100644
--- a/bookwyrm/templates/get_started/users.html
+++ b/bookwyrm/templates/get_started/users.html
@@ -5,6 +5,23 @@
 <div class="block">
     <h2 class="title is-4">{% trans "Who to follow" %}</h2>
 
+    <p class="subtitle is-6">You can follow users on other BookWyrm instances and federated services like Mastodon.</p>
+    <form class="field has-addons" method="get" action="{% url 'get-started-users' %}">
+        <div class="control">
+            <input type="text" name="query" value="{{ request.GET.query }}" class="input" placeholder="{% trans 'Search for a user' %}" aria-label="{% trans 'Search for a user' %}">
+            {% if request.GET.query and not user_results %}
+            <p class="help">{% trans "Sorry, no users were found" %}</p>
+            {% endif %}
+        </div>
+        <div class="control">
+            <button class="button" type="submit">
+                <span class="icon icon-search" title="{% trans 'Search' %}">
+                    <span class="is-sr-only">{% trans "Search" %}</span>
+                </span>
+            </button>
+        </div>
+    </form>
+
     {% include 'feed/suggested_users.html' with suggested_users=suggested_users %}
 </div>
 {% endblock %}
diff --git a/bookwyrm/views/get_started.py b/bookwyrm/views/get_started.py
index fba01840..184cfc3d 100644
--- a/bookwyrm/views/get_started.py
+++ b/bookwyrm/views/get_started.py
@@ -114,6 +114,5 @@ class GetStartedUsers(View):
         )
         data = {
             "suggested_users": suggested_users,
-            "next": "get-started-profile",
         }
         return TemplateResponse(request, "get_started/users.html", data)