diff --git a/src/routes/getUserInfo.ts b/src/routes/getUserInfo.ts
index ca1066c..636d2ad 100644
--- a/src/routes/getUserInfo.ts
+++ b/src/routes/getUserInfo.ts
@@ -1,11 +1,15 @@
 import {db} from '../databases/databases';
 import {getHash} from '../utils/getHash';
+import {isUserVIP} from '../utils/isUserVIP';
 import {Request, Response} from 'express';
-import {Logger} from '../utils/logger'
+import {Logger} from '../utils/logger';
+import { HashedUserID, UserID } from '../types/user.model';
 
-async function dbGetSubmittedSegmentSummary(userID: string): Promise<{ minutesSaved: number, segmentCount: number }> {
+async function dbGetSubmittedSegmentSummary(userID: HashedUserID): Promise<{ minutesSaved: number, segmentCount: number }> {
     try {
-        let row = await db.prepare("get", `SELECT SUM((("endTime" - "startTime") / 60) * "views") as "minutesSaved", count(*) as "segmentCount" FROM "sponsorTimes" WHERE "userID" = ? AND "votes" > -2 AND "shadowHidden" != 1`, [userID]);
+        let row = await db.prepare("get", `SELECT SUM((("endTime" - "startTime") / 60) * "views") as "minutesSaved",
+                                            count(*) as "segmentCount" FROM "sponsorTimes" 
+                                            WHERE "userID" = ? AND "votes" > -2 AND "shadowHidden" != 1`, [userID]);
         if (row.minutesSaved != null) {
             return {
                 minutesSaved: row.minutesSaved,
@@ -22,7 +26,7 @@ async function dbGetSubmittedSegmentSummary(userID: string): Promise<{ minutesSa
     }
 }
 
-async function dbGetUsername(userID: string) {
+async function dbGetUsername(userID: HashedUserID) {
     try {
         let row = await db.prepare('get', `SELECT "userName" FROM "userNames" WHERE "userID" = ?`, [userID]);
         if (row !== undefined) {
@@ -36,24 +40,19 @@ async function dbGetUsername(userID: string) {
     }
 }
 
-async function dbGetViewsForUser(userID: string) {
+async function dbGetViewsForUser(userID: HashedUserID) {
     try {
         let row = await db.prepare('get', `SELECT SUM("views") as "viewCount" FROM "sponsorTimes" WHERE "userID" = ? AND "votes" > -2 AND "shadowHidden" != 1`, [userID]);
-        //increase the view count by one
-        if (row.viewCount != null) {
-            return row.viewCount;
-        } else {
-            return 0;
-        }
+        return row?.viewCount ?? 0;
     } catch (err) {
         return false;
     }
 }
 
-async function dbGetWarningsForUser(userID: string): Promise<number> {
+async function dbGetWarningsForUser(userID: HashedUserID): Promise<number> {
     try {
-        let rows = await db.prepare('all', `SELECT * FROM "warnings" WHERE "userID" = ?`, [userID]);
-        return rows.length;
+        let row = await db.prepare('get', `SELECT COUNT(*) as total FROM "warnings" WHERE "userID" = ? AND "enabled" = 1`, [userID]);
+        return row?.total ?? 0;
     } catch (err) {
         Logger.error('Couldn\'t get warnings for user ' + userID + '. returning 0');
         return 0;
@@ -61,7 +60,7 @@ async function dbGetWarningsForUser(userID: string): Promise<number> {
 }
 
 export async function getUserInfo(req: Request, res: Response) {
-    let userID = req.query.userID as string;
+    let userID = req.query.userID as UserID;
 
     if (userID == undefined) {
         //invalid request
@@ -70,17 +69,18 @@ export async function getUserInfo(req: Request, res: Response) {
     }
 
     //hash the userID
-    userID = getHash(userID);
+    const hashedUserID: HashedUserID = getHash(userID);
 
-    const segmentsSummary = await dbGetSubmittedSegmentSummary(userID);
+    const segmentsSummary = await dbGetSubmittedSegmentSummary(hashedUserID);
     if (segmentsSummary) {
         res.send({
-            userID,
-            userName: await dbGetUsername(userID),
+            userID: hashedUserID,
+            userName: await dbGetUsername(hashedUserID),
             minutesSaved: segmentsSummary.minutesSaved,
             segmentCount: segmentsSummary.segmentCount,
-            viewCount: await dbGetViewsForUser(userID),
-            warnings: await dbGetWarningsForUser(userID),
+            viewCount: await dbGetViewsForUser(hashedUserID),
+            warnings: await dbGetWarningsForUser(hashedUserID),
+            vip: await isUserVIP(hashedUserID),
         });
     } else {
         res.status(400).send();