diff --git a/src/gplay/java/com/owncloud/android/utils/PushUtils.java b/src/gplay/java/com/owncloud/android/utils/PushUtils.java
index a936712fd1..9bc50f5781 100644
--- a/src/gplay/java/com/owncloud/android/utils/PushUtils.java
+++ b/src/gplay/java/com/owncloud/android/utils/PushUtils.java
@@ -248,9 +248,9 @@ public class PushUtils {
                                             gson.toJson(pushArbitraryData));
                                 }
                             } else if (remoteOperationResult.getCode() ==
-                                    RemoteOperationResult.ResultCode.ACCOUNT_USES_OLD_LOGIN) {
+                                    RemoteOperationResult.ResultCode.ACCOUNT_USES_STANDARD_PASSWORD) {
                                 arbitraryDataProvider.storeOrUpdateKeyValue(account.name,
-                                        AccountUtils.ACCOUNT_USES_OLD_LOGIN, "true");
+                                        AccountUtils.ACCOUNT_USES_STANDARD_PASSWORD, "true");
                             }
                         } catch (com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException e) {
                             Log_OC.d(TAG, "Failed to find an account");
diff --git a/src/main/java/com/owncloud/android/authentication/AccountUtils.java b/src/main/java/com/owncloud/android/authentication/AccountUtils.java
index 478a2b0d5c..0d16f4c30c 100644
--- a/src/main/java/com/owncloud/android/authentication/AccountUtils.java
+++ b/src/main/java/com/owncloud/android/authentication/AccountUtils.java
@@ -52,7 +52,7 @@ public class AccountUtils {
 
     public static final int ACCOUNT_VERSION = 1;
     public static final int ACCOUNT_VERSION_WITH_PROPER_ID = 2;
-    public static final String ACCOUNT_USES_OLD_LOGIN = "ACCOUNT_USES_OLD_LOGIN";
+    public static final String ACCOUNT_USES_STANDARD_PASSWORD = "ACCOUNT_USES_STANDARD_PASSWORD";
 
     /**
      * Can be used to get the currently selected ownCloud {@link Account} in the
diff --git a/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java b/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java
index f4ed951784..e2567afb96 100644
--- a/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java
+++ b/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java
@@ -154,7 +154,7 @@ public class NotificationsActivity extends FileActivity {
             ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProvider(getContentResolver());
 
             boolean usesOldLogin = arbitraryDataProvider.getBooleanValue(account.name,
-                    AccountUtils.ACCOUNT_USES_OLD_LOGIN);
+                    AccountUtils.ACCOUNT_USES_STANDARD_PASSWORD);
 
             if (usesOldLogin) {
                 Snackbar.make(emptyContentContainer, R.string.push_notifications_old_login,