diff --git a/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java
index 06e43cef4b373947d6f85dfc430383899c10db0f..a39b7801b33c44460f89816c8ee8afb818a18796 100644
--- a/src/main/java/eu/siacs/conversations/entities/Contact.java
+++ b/src/main/java/eu/siacs/conversations/entities/Contact.java
@@ -151,7 +151,7 @@ public class Contact implements ListItem, Blockable {
     }
 
     public String getDisplayName() {
-        if (isSelf()) {
+        if (isSelf() && TextUtils.isEmpty(this.systemName)) {
             final String displayName = account.getDisplayName();
             if (!Strings.isNullOrEmpty(displayName)) {
                 return displayName;
diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
index 13db804ec3177203071e02a26a9fd9915323cbcd..4e619c9d3731467c7fcaec906667a087f0241c2b 100644
--- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
@@ -1080,6 +1080,12 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
                     }
                 }
 
+                final Contact self = account.getSelfContact();
+                if (self.match(this, needle)) {
+                    self.setSystemName("Note to Self");
+                    this.contacts.add(self);
+                }
+
                 for (Bookmark bookmark : account.getBookmarks()) {
                     if (bookmark.match(this, needle)) {
                         if (bookmark.getJid().toString().equals("discuss@conference.soprani.ca")) {