diff --git a/src/routes/setUsername.ts b/src/routes/setUsername.ts
index e31328c..1f24780 100644
--- a/src/routes/setUsername.ts
+++ b/src/routes/setUsername.ts
@@ -70,7 +70,8 @@ export async function setUsername(req: Request, res: Response): Promise<Response
         if (row?.userName !== undefined) {
             //already exists, update this row
             oldUserName = row.userName;
-            await db.prepare("run", `UPDATE "userNames" SET "userName" = ?, "locked" = ? WHERE "userID" = ?`, [userName, locked, userID]);
+            if (userName == userID && !locked) await db.prepare("run", `DELETE FROM "userNames" WHERE "userID" = ?`, [userID]);
+            else await db.prepare("run", `UPDATE "userNames" SET "userName" = ?, "locked" = ? WHERE "userID" = ?`, [userName, locked, userID]);
         } else {
             //add to the db
             await db.prepare("run", `INSERT INTO "userNames"("userID", "userName", "locked") VALUES(?, ?, ?)`, [userID, userName, locked]);
diff --git a/test/cases/setUsername.ts b/test/cases/setUsername.ts
index 89af032..39a518b 100644
--- a/test/cases/setUsername.ts
+++ b/test/cases/setUsername.ts
@@ -20,6 +20,7 @@ const user06PrivateUserID = "setUsername_06";
 const username06 = "Username 06";
 const user07PrivateUserID = "setUsername_07";
 const username07 = "Username 07";
+const user08PrivateUserID = "setUsername_08";
 
 async function addUsername(userID: string, userName: string, locked = 0) {
     await db.prepare("run", 'INSERT INTO "userNames" ("userID", "userName", "locked") VALUES(?, ?, ?)', [userID, userName, locked]);
@@ -231,4 +232,14 @@ describe("setUsername", () => {
             })
             .catch((err) => done(err));
     });
+
+    it("Should delete row if new username is same as publicID", (done) => {
+        const publicID = getHash(user08PrivateUserID);
+        postSetUserName(getHash(user08PrivateUserID), publicID)
+            .then(async () => {
+                const usernameInfo = await getUsernameInfo(getHash(user08PrivateUserID));
+                assert.strictEqual(usernameInfo, null);
+                done();
+            });
+    });
 });