diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java b/src/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java
index eaa6a72d6..765f54083 100644
--- a/src/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java
+++ b/src/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java
@@ -64,7 +64,7 @@ public class ProfilePreference extends Preference {
   public void refresh() {
     if (profileAddressView == null) return;
 
-    final String address = DcHelper.get(getContext(), DcHelper.CONFIG_ADDRESS);
+    final String address = DcHelper.get(getContext(), DcHelper.CONFIG_CONFIGURED_ADDRESS);
     String profileName  = DcHelper.get(getContext(), DcHelper.CONFIG_DISPLAY_NAME);
 
     if(profileName==null || profileName.isEmpty()) {
diff --git a/src/org/thoughtcrime/securesms/qr/QrShowActivity.java b/src/org/thoughtcrime/securesms/qr/QrShowActivity.java
index b896cfe1d..30cae9e03 100644
--- a/src/org/thoughtcrime/securesms/qr/QrShowActivity.java
+++ b/src/org/thoughtcrime/securesms/qr/QrShowActivity.java
@@ -58,7 +58,7 @@ public class QrShowActivity extends AppCompatActivity {
             // verify-contact
             String selfName = DcHelper.get(this, DcHelper.CONFIG_DISPLAY_NAME); // we cannot use MrContact.getDisplayName() as this would result in "Me" instead of
             if (selfName.isEmpty()) {
-                selfName = DcHelper.get(this, DcHelper.CONFIG_ADDRESS, "unknown");
+                selfName = DcHelper.get(this, DcHelper.CONFIG_CONFIGURED_ADDRESS, "unknown");
             }
             supportActionBar.setTitle(selfName);
             supportActionBar.setSubtitle(R.string.qrshow_join_contact_title);
diff --git a/src/org/thoughtcrime/securesms/service/IPCAddAccountsService.java b/src/org/thoughtcrime/securesms/service/IPCAddAccountsService.java
index 1091a9509..c77423f5d 100644
--- a/src/org/thoughtcrime/securesms/service/IPCAddAccountsService.java
+++ b/src/org/thoughtcrime/securesms/service/IPCAddAccountsService.java
@@ -24,6 +24,7 @@ import org.thoughtcrime.securesms.connect.DcHelper;
 import java.lang.ref.WeakReference;
 
 import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_ADDRESS;
+import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_CONFIGURED_ADDRESS;
 
 import com.b44t.messenger.DcAccounts;
 import com.b44t.messenger.DcContext;
@@ -58,7 +59,7 @@ public class IPCAddAccountsService extends Service {
         int[] accountIds = accounts.getAll();
         for (int accountId : accountIds) {
           DcContext dcContext = accounts.getAccount(accountId);
-          String accountAddress = dcContext.getConfig(CONFIG_ADDRESS);
+          String accountAddress = dcContext.getConfig(CONFIG_CONFIGURED_ADDRESS);
           if (accountAddress.equals(newAddress)) {
             Log.d(TAG, newAddress + " already exists. Switching account.");
             AccountManager.getInstance().switchAccount(context, accountId);