diff --git a/assets/openapi.json b/assets/openapi.json
index 298ad18ec..3c573188a 100644
Binary files a/assets/openapi.json and b/assets/openapi.json differ
diff --git a/assets/schemas.json b/assets/schemas.json
index a7d759fab..46a36939b 100644
Binary files a/assets/schemas.json and b/assets/schemas.json differ
diff --git a/src/api/routes/auth/forgot.ts b/src/api/routes/auth/forgot.ts
index 26e1b353b..4ebb96545 100644
--- a/src/api/routes/auth/forgot.ts
+++ b/src/api/routes/auth/forgot.ts
@@ -68,7 +68,7 @@ router.post(
 
         if (user && user.email) {
             Email.sendResetPassword(user, user.email).catch((e) => {
-                console.error(`Failed to send password reset email to ${user.username}#${user.discriminator} (${user.id}): ${e}`);
+                console.error(`Failed to send password reset email to ${user.tag} (${user.id}): ${e}`);
             });
         }
     },
diff --git a/src/api/routes/auth/verify/resend.ts b/src/api/routes/auth/verify/resend.ts
index 4c0339bf6..453c616d0 100644
--- a/src/api/routes/auth/verify/resend.ts
+++ b/src/api/routes/auth/verify/resend.ts
@@ -56,7 +56,7 @@ router.post(
                 return res.sendStatus(204);
             })
             .catch((e) => {
-                console.error(`Failed to send verification email to ${user.username}#${user.discriminator}: ${e}`);
+                console.error(`Failed to send verification email to ${user.tag}: ${e}`);
                 throw new HTTPError("Failed to send verification email", 500);
             });
     },
diff --git a/src/util/entities/User.ts b/src/util/entities/User.ts
index 84471e0d4..d3c01c1a3 100644
--- a/src/util/entities/User.ts
+++ b/src/util/entities/User.ts
@@ -245,6 +245,13 @@ export class User extends BaseClass {
         }
     }
 
+    public get tag(): string {
+        //const { uniqueUsernames } = Config.get().general;
+        const uniqueUsernames = false;
+
+        return uniqueUsernames ? this.username : `${this.username}#${this.discriminator}`;
+    }
+
     static async register({
         email,
         username,
@@ -310,7 +317,7 @@ export class User extends BaseClass {
         // send verification email if users aren't verified by default and we have an email
         if (!Config.get().defaults.user.verified && email) {
             await Email.sendVerifyEmail(user, email).catch((e) => {
-                console.error(`Failed to send verification email to ${user.username}#${user.discriminator}: ${e}`);
+                console.error(`Failed to send verification email to ${user.tag}: ${e}`);
             });
         }