diff --git a/bookwyrm/views/get_started.py b/bookwyrm/views/get_started.py
index 5573bf19..7eae9483 100644
--- a/bookwyrm/views/get_started.py
+++ b/bookwyrm/views/get_started.py
@@ -120,9 +120,9 @@ class GetStartedUsers(View):
         )
 
         if user_results.count() < 5:
-            suggested_users = get_suggested_users(request.user)
+            user_results = list(user_results) + list(get_suggested_users(request.user))
 
         data = {
-            "suggested_users": list(user_results) + list(suggested_users),
+            "suggested_users": user_results,
         }
         return TemplateResponse(request, "get_started/users.html", data)
diff --git a/bookwyrm/views/password.py b/bookwyrm/views/password.py
index 933817a8..91a379f3 100644
--- a/bookwyrm/views/password.py
+++ b/bookwyrm/views/password.py
@@ -27,7 +27,7 @@ class PasswordResetRequest(View):
         """create a password reset token"""
         email = request.POST.get("email")
         try:
-            user = models.User.objects.get(email=email)
+            user = models.User.objects.get(email=email, email__isnull=False)
         except models.User.DoesNotExist:
             data = {"error": _("No user with that email address was found.")}
             return TemplateResponse(request, "password_reset_request.html", data)