diff --git a/index.js b/index.js
index 259b425..da4d937 100644
--- a/index.js
+++ b/index.js
@@ -577,7 +577,7 @@ app.get('/api/getSavedTimeForUser', function (req, res) {
     userID = getHash(userID);
 
     //up the view count by one
-    db.prepare("SELECT SUM((endTime - startTime) / 60 * views) as minutesSaved FROM sponsorTimes WHERE userID = ?").get(userID, function(err, row) {
+    db.prepare("SELECT SUM((endTime - startTime) / 60 * views) as minutesSaved FROM sponsorTimes WHERE userID = ? AND votes > -1 AND shadowHidden != 1 ").get(userID, function(err, row) {
         if (err) console.log(err);
 
         if (row.minutesSaved != null) {
@@ -618,13 +618,12 @@ app.get('/api/getTopUsers', function (req, res) {
     let totalSubmissions = [];
     let minutesSaved = [];
 
-    db.prepare("SELECT sponsorTimes.userID as userID, COUNT(*) as totalSubmissions, SUM(views) as viewCount, SUM((sponsorTimes.endTime - sponsorTimes.startTime) / 60 * sponsorTimes.views) as minutesSaved, userNames.userName as userName FROM sponsorTimes LEFT JOIN userNames ON sponsorTimes.userID=userNames.userID WHERE sponsorTimes.votes > -1 AND sponsorTimes.shadowHidden != 1 GROUP BY sponsorTimes.userID ORDER BY " + sortBy + " DESC LIMIT 100").all(function(err, rows) {
+    db.prepare("SELECT COUNT(*) as totalSubmissions, SUM(views) as viewCount," + 
+                    "SUM((sponsorTimes.endTime - sponsorTimes.startTime) / 60 * sponsorTimes.views) as minutesSaved, " +
+                        "IFNULL(userNames.userName, sponsorTimes.userID) as userName FROM sponsorTimes LEFT JOIN userNames ON sponsorTimes.userID=userNames.userID " +
+                            "WHERE sponsorTimes.votes > -1 AND sponsorTimes.shadowHidden != 1 GROUP BY IFNULL(userName, sponsorTimes.userID) ORDER BY " + sortBy + " DESC LIMIT 100").all(function(err, rows) {
         for (let i = 0; i < rows.length; i++) {
-            if (rows[i].userName != null) {
-                userNames[i] = rows[i].userName;
-            } else {
-                userNames[i] = rows[i].userID;
-            }
+            userNames[i] = rows[i].userName;
 
             viewCounts[i] = rows[i].viewCount;
             totalSubmissions[i] = rows[i].totalSubmissions;