diff --git a/src/main/java/eu/siacs/conversations/parser/IqParser.java b/src/main/java/eu/siacs/conversations/parser/IqParser.java
index cce0a7ff8..4e7d23cc1 100644
--- a/src/main/java/eu/siacs/conversations/parser/IqParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/IqParser.java
@@ -115,7 +115,7 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
                 final Contact contact = account.getRoster().getContact(jid);
                 boolean bothPre = contact.getOption(Contact.Options.TO) && contact.getOption(Contact.Options.FROM);
                 if (!contact.getOption(Contact.Options.DIRTY_PUSH)) {
-                    contact.setServerName(contact.getPublicDisplayName());
+                    contact.setServerName(name);
                     contact.parseGroupsFromElement(item);
                 }
                 if ("remove".equals(subscription)) {
@@ -485,4 +485,6 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
             }
         }
     }
+
+    ;
 }
diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
index d6935f2ab..98bd2efb4 100644
--- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
@@ -690,10 +690,10 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
             mNotifyStatusText.setText(R.string.notify_on_all_messages);
         }
 
-        TextView username = binding.detailsContactName;
-        username.setText(contact.getDisplayName());
-        username.setSelected(true);
-        username.setClickable(false);
+        TextView abtitle = binding.detailsContactName;
+        abtitle.setText(contact.getDisplayName());
+        abtitle.setSelected(true);
+        abtitle.setClickable(false);
 
         invalidateOptionsMenu();
         if (contact.showInRoster()) {