diff --git a/website/public/bits/friend-item.php b/website/public/bits/friend-item.php
index 181f9b6..6a0c868 100644
--- a/website/public/bits/friend-item.php
+++ b/website/public/bits/friend-item.php
@@ -41,7 +41,7 @@ foreach($friends as $i => $friend) {
                         <?= $friend->fullname ?><br/>
                         <span style='color: #666'><?php
                             if (isset($friend->username)) {
-                                echo $friend->username;
+                                echo $friend->usernameshort;
                             } else if (isset($friend->content)) {
                                 echo $friend->content;
                             }
diff --git a/website/queries/friendship.php b/website/queries/friendship.php
index e1a8c53..6ea6313 100644
--- a/website/queries/friendship.php
+++ b/website/queries/friendship.php
@@ -10,7 +10,8 @@ function selectLimitedFriends($userID, $limit) {
     $stmt = prepareQuery("
         SELECT
             `userID`,
-            LEFT(`username`, 12) as `username`,
+            LEFT(`username`, 12) as `usernameshort`,
+            `username`,
             LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`,
             IFNULL(
                 `profilepicture`,
@@ -50,7 +51,8 @@ function selectAllFriends($userID) {
     $stmt = prepareQuery("
         SELECT
             `userID`,
-            LEFT(`username`, 12) as `username`,
+            LEFT(`username`, 12) as `usernameshort`,
+            `username`,
             LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`,
             IFNULL(
                 `profilepicture`,
@@ -85,7 +87,8 @@ function selectAllFriendRequests() {
     $stmt = prepareQuery("
         SELECT
             `userID`,
-            LEFT(`username`, 12) as `username`,
+            LEFT(`username`, 12) as `usernameshort`,
+            `username`,
             LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`,
             IFNULL(
                 `profilepicture`,
@@ -235,8 +238,8 @@ function searchSomeFriends($n, $m, $search) {
     $stmt = prepareQuery("
     SELECT
             `userID`,
-            
-            LEFT(`username`, 12) as `username`,
+            LEFT(`username`, 12) as `usernameshort`,
+            `username`,
             LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`,
             IFNULL(
                 `profilepicture`,
diff --git a/website/queries/user.php b/website/queries/user.php
index 72205ba..1e54763 100644
--- a/website/queries/user.php
+++ b/website/queries/user.php
@@ -349,7 +349,8 @@ function searchSomeUsers($n, $m, $search) {
     $stmt = prepareQuery("
     SELECT
         `userID`,
-        LEFT(`username`, 12) as `username`,
+        LEFT(`username`, 12) as `usernameshort`,
+        `username`,
         IFNULL(
             `profilepicture`,
             '../img/avatar-standard.png'