diff --git a/app/src/main/java/com/h/pixeldroid/posts/PostActivity.kt b/app/src/main/java/com/h/pixeldroid/posts/PostActivity.kt
index be453563..c7d6d0c6 100644
--- a/app/src/main/java/com/h/pixeldroid/posts/PostActivity.kt
+++ b/app/src/main/java/com/h/pixeldroid/posts/PostActivity.kt
@@ -48,7 +48,7 @@ class PostActivity : BaseActivity() {
         accessToken = user?.accessToken.orEmpty()
 
 
-        supportActionBar?.title = getString(R.string.post_title).format(status.account?.getDisplayName())
+        supportActionBar?.title = getString(R.string.post_title).format(status.account?.getusername())
 
         val holder = StatusViewHolder(binding.postFragmentSingle)
 
diff --git a/app/src/main/java/com/h/pixeldroid/posts/StatusViewHolder.kt b/app/src/main/java/com/h/pixeldroid/posts/StatusViewHolder.kt
index d5b5b89e..77b061b7 100644
--- a/app/src/main/java/com/h/pixeldroid/posts/StatusViewHolder.kt
+++ b/app/src/main/java/com/h/pixeldroid/posts/StatusViewHolder.kt
@@ -86,13 +86,13 @@ class StatusViewHolder(val binding: PostFragmentBinding) : RecyclerView.ViewHold
     ) {
         //Setup username as a button that opens the profile
         binding.username.apply {
-            text = status?.account?.getDisplayName() ?: ""
+            text = status?.account?.getusername() ?: ""
             setTypeface(null, Typeface.BOLD)
             setOnClickListener { status?.account?.openProfile(binding.root.context) }
         }
 
         binding.usernameDesc.apply {
-            text = status?.account?.getDisplayName() ?: ""
+            text = status?.account?.getusername() ?: ""
             setTypeface(null, Typeface.BOLD)
         }
 
diff --git a/app/src/main/java/com/h/pixeldroid/profile/FollowsActivity.kt b/app/src/main/java/com/h/pixeldroid/profile/FollowsActivity.kt
index 52f0017a..e49c2fb2 100644
--- a/app/src/main/java/com/h/pixeldroid/profile/FollowsActivity.kt
+++ b/app/src/main/java/com/h/pixeldroid/profile/FollowsActivity.kt
@@ -25,9 +25,9 @@ class FollowsActivity : BaseActivity() {
 
         if(account == null) {
             val user = db.userDao().getActiveUser()!!
-            startFragment(user.user_id, user.display_name, followers)
+            startFragment(user.user_id, user.username, followers)
         } else {
-            startFragment(account.id!!, account.getDisplayName(), followers)
+            startFragment(account.id!!, account.getusername(), followers)
         }
     }
 
diff --git a/app/src/main/java/com/h/pixeldroid/profile/ProfileActivity.kt b/app/src/main/java/com/h/pixeldroid/profile/ProfileActivity.kt
index 4979e4d1..4675e136 100644
--- a/app/src/main/java/com/h/pixeldroid/profile/ProfileActivity.kt
+++ b/app/src/main/java/com/h/pixeldroid/profile/ProfileActivity.kt
@@ -167,7 +167,7 @@ class ProfileActivity : BaseActivity() {
             lifecycleScope
         )
 
-        val displayName = account.getDisplayName()
+        val displayName = account.getusername()
 
         binding.accountNameTextView.text = displayName
 
diff --git a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Account.kt b/app/src/main/java/com/h/pixeldroid/utils/api/objects/Account.kt
index 03fe85d7..6f279f3f 100644
--- a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Account.kt
+++ b/app/src/main/java/com/h/pixeldroid/utils/api/objects/Account.kt
@@ -79,6 +79,12 @@ data class Account(
         else -> display_name.orEmpty()
     }
 
+    fun getusername() : String = when {
+        username.isNullOrBlank() && display_name.isNullOrBlank() -> ""
+        username.isNullOrBlank() -> "@$display_name"
+        else -> username.orEmpty()
+    }
+
     /**
      * @brief Open profile activity with given account
      */
diff --git a/app/src/test/java/com/h/pixeldroid/PostUnitTest.kt b/app/src/test/java/com/h/pixeldroid/PostUnitTest.kt
index e70bb86f..73d2e704 100644
--- a/app/src/test/java/com/h/pixeldroid/PostUnitTest.kt
+++ b/app/src/test/java/com/h/pixeldroid/PostUnitTest.kt
@@ -34,7 +34,7 @@ class PostUnitTest {
     fun getProfilePicUrlReturnsAValidURL() = Assert.assertNotNull(status.getProfilePicUrl())
 
     @Test
-    fun getUsernameReturnsACorrectName() = Assert.assertEquals(status.account!!.display_name, status.account!!.getDisplayName())
+    fun getUsernameReturnsACorrectName() = Assert.assertEquals(status.account!!.display_name, status.account!!.getusername())
 
     /*@Test
     fun getUsernameReturnsOtherNameIfUsernameIsNull() {