diff --git a/website/server/controllers/api-v3/auth.js b/website/server/controllers/api-v3/auth.js
index 37d7f7e451..1866340315 100644
--- a/website/server/controllers/api-v3/auth.js
+++ b/website/server/controllers/api-v3/auth.js
@@ -313,6 +313,8 @@ api.resetPassword = {
       });
 
       await user.save();
+    } else {
+      let user = await User.findOne({ 'auth.google.email': email }).exec();
     }
 
     res.respond(200, {}, res.t('passwordReset'));
diff --git a/website/server/controllers/api-v4/members.js b/website/server/controllers/api-v4/members.js
index 6279248d6f..2a6623c4e7 100644
--- a/website/server/controllers/api-v4/members.js
+++ b/website/server/controllers/api-v4/members.js
@@ -67,7 +67,7 @@ api.getUsernameAutocompletes = {
         .find(recentChatQuery)
         .select(['profile.name', 'contributor', 'auth.local.username'])
         .sort({'auth.timestamps.loggedin': -1})
-        .limit(5 - members.length)
+        .limit(5)
         .exec();
     }