diff --git a/app/src/main/java/com/nextcloud/client/account/CurrentAccountProvider.java b/app/src/main/java/com/nextcloud/client/account/CurrentAccountProvider.java
index b74bb3f0add0..0f2daf5f0841 100644
--- a/app/src/main/java/com/nextcloud/client/account/CurrentAccountProvider.java
+++ b/app/src/main/java/com/nextcloud/client/account/CurrentAccountProvider.java
@@ -16,16 +16,6 @@
  * @see UserAccountManager
  */
 public interface CurrentAccountProvider {
-    /**
-     * Get currently active account.
-     * Replaced by getUser()
-     *
-     * @return Currently selected {@link Account} or first valid {@link Account} registered in OS or null, if not available at all.
-     */
-    @Deprecated
-    @NonNull
-    Account getCurrentAccount();
-
     /**
      * Get currently active user profile. If there is no active user, anonymous user is returned.
      *
diff --git a/app/src/main/java/com/nextcloud/client/account/UserAccountManagerImpl.java b/app/src/main/java/com/nextcloud/client/account/UserAccountManagerImpl.java
index 3aec76281df3..77cdce85741b 100644
--- a/app/src/main/java/com/nextcloud/client/account/UserAccountManagerImpl.java
+++ b/app/src/main/java/com/nextcloud/client/account/UserAccountManagerImpl.java
@@ -187,9 +187,8 @@ public boolean exists(Account account) {
         }
     }
 
-    @Override
     @NonNull
-    public Account getCurrentAccount() {
+    private Account getCurrentAccount() {
         Account[] ocAccounts = getAccounts();
 
         ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProviderImpl(context);
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
index 6fb5f421af7c..9b6e6dcbe1af 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
@@ -1195,7 +1195,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 
             // current account has changed
             if (data.getBooleanExtra(ManageAccountsActivity.KEY_CURRENT_ACCOUNT_CHANGED, false)) {
-                setAccount(accountManager.getCurrentAccount(), false);
+                setUser(accountManager.getUser());
                 restart();
             }
         } else if (requestCode == PassCodeManager.PASSCODE_ACTIVITY && data != null) {