diff --git a/functions/index.js b/functions/index.js
index b673483c3..c36495dab 100644
--- a/functions/index.js
+++ b/functions/index.js
@@ -1383,7 +1383,7 @@ exports.testCompleted = functions.https.onRequest(async (request, response) => {
     //   .then((user) => {
     //     return user.emailVerified;
     //   });
-    emailVerified = true;
+    // emailVerified = true;
 
     // if (obj.funbox === "nospace") {
     //   response.status(200).send({ data: { resultCode: -1 } });
@@ -2342,8 +2342,15 @@ exports.checkLeaderboards = functions.https.onRequest(
       return;
     }
 
+    let emailVerified = await admin
+      .auth()
+      .getUser(request.uid)
+      .then((user) => {
+        return user.emailVerified;
+      });
+
     try {
-      if (request.emailVerified === false) {
+      if (emailVerified === false) {
         response.status(200).send({
           data: {
             needsToVerifyEmail: true,
diff --git a/src/js/test/test-leaderboards.js b/src/js/test/test-leaderboards.js
index 0fd77ed3b..f3053f838 100644
--- a/src/js/test/test-leaderboards.js
+++ b/src/js/test/test-leaderboards.js
@@ -163,7 +163,7 @@ export function check(completedEvent) {
       CloudFunctions.checkLeaderboards({
         uid: completedEvent.uid,
         lbMemory: DB.getSnapshot().lbMemory,
-        emailVerified: DB.getSnapshot().emailVerified,
+        // emailVerified: DB.getSnapshot().emailVerified,
         name: DB.getSnapshot().name,
         banned: DB.getSnapshot().banned,
         verified: DB.getSnapshot().verified,