diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt
index b5472abe5..b2faeb657 100644
--- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt
@@ -32,7 +32,6 @@ import org.linphone.activities.main.settings.SettingListenerStub
 import org.linphone.core.*
 import org.linphone.core.tools.Log
 import org.linphone.utils.Event
-import org.linphone.utils.LinphoneUtils
 
 class AccountSettingsViewModelFactory(private val identity: String) :
     ViewModelProvider.NewInstanceFactory() {
@@ -296,7 +295,7 @@ class AccountSettingsViewModel(val proxyConfig: ProxyConfig) : GenericSettingsVi
         isDefault.value = core.defaultProxyConfig == proxyConfig
         val identityAddress = proxyConfig.identityAddress
         if (identityAddress != null) {
-            displayName.value = LinphoneUtils.getDisplayName(identityAddress)
+            displayName.value = identityAddress.displayName ?: ""
             identity.value = identityAddress.asStringUriOnly()
         }
 
diff --git a/app/src/main/res/layout/side_menu_account_cell.xml b/app/src/main/res/layout/side_menu_account_cell.xml
index 9a7e3b900..8dc113737 100644
--- a/app/src/main/res/layout/side_menu_account_cell.xml
+++ b/app/src/main/res/layout/side_menu_account_cell.xml
@@ -15,8 +15,11 @@
         android:gravity="center">
 
         <TextView
-            android:text="@{data.displayUsernameInsteadOfIdentity ? data.userName : data.identity}"
-            style="@style/assistant_input_field_header_font"
+            android:text="@{data.displayName + ` ` + (data.displayUsernameInsteadOfIdentity ? data.userName : data.identity)}"
+            android:textColor="?attr/primaryTextColor"
+            android:textSize="13sp"
+            android:singleLine="true"
+            android:ellipsize="end"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:gravity="center_vertical"
diff --git a/app/src/main/res/layout/side_menu_fragment.xml b/app/src/main/res/layout/side_menu_fragment.xml
index f72a3b5a2..f3fbf879a 100644
--- a/app/src/main/res/layout/side_menu_fragment.xml
+++ b/app/src/main/res/layout/side_menu_fragment.xml
@@ -82,7 +82,7 @@
 
                 <TextView
                     android:visibility="@{viewModel.defaultAccountFound ? View.VISIBLE : View.GONE}"
-                    android:text="@{viewModel.defaultAccount.displayName}"
+                    android:text="@{viewModel.defaultAccount.displayName.isEmpty() ? viewModel.defaultAccount.userName : viewModel.defaultAccount.displayName}"
                     android:textColor="?attr/lightToolbarTextColor"
                     android:textStyle="bold"
                     android:textSize="18sp"