1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
index 129f5400e..456b907df 100644
--- a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
@@ -626,10 +626,10 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
     private void onEditYourNameClicked(View view) {
         String nick;
         try {
-            if (mAccount.getDisplayName() != null) {
+            if (mAccount != null) {
                 nick = mAccount.getDisplayName();
             } else {
-                nick = mAccount.getJid().getLocal();
+                nick = "";
             }
         } catch (Exception e) {
             e.printStackTrace();