diff --git a/library/build.gradle b/library/build.gradle
index 79c688edee92aea77eab620e2b0b3461929714c2..08fb45aaaef331a87d7b1c0e6a3013e23862b3c2 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -47,7 +47,7 @@ configurations {
 
 def versionMajor = 2
 def versionMinor = 0
-def versionPatch = 0
+def versionPatch = 1
 def upstreamVersion = "2.17"
 def releasePatch = "release"
 def libName = "Nextcloud-Android-Library"
diff --git a/library/src/main/java/com/owncloud/android/lib/common/OwnCloudClientManager.java b/library/src/main/java/com/owncloud/android/lib/common/OwnCloudClientManager.java
index 83e211bbabd5390e116dc5b3b523a0b8c310b042..5e325fd401deea2f76b38a583862ac236df4395b 100644
--- a/library/src/main/java/com/owncloud/android/lib/common/OwnCloudClientManager.java
+++ b/library/src/main/java/com/owncloud/android/lib/common/OwnCloudClientManager.java
@@ -148,7 +148,7 @@ public class OwnCloudClientManager {
                 Log_OC.v(TAG, "reusing client for session " + sessionName);
             }
             AccountUtils.restoreCookies(accountName, client, context);
-            keepCredentialsUpdated(account, client);
+            keepCredentialsUpdated(context, account, client);
             keepUriUpdated(account, client);
         }
 
@@ -334,13 +334,9 @@ public class OwnCloudClientManager {
     }
 
 
-    private void keepCredentialsUpdated(OwnCloudAccount account, OwnCloudClient reusedClient) {
-        OwnCloudCredentials recentCredentials = account.getCredentials();
-        if (recentCredentials != null && !recentCredentials.getAuthToken().equals(
-                reusedClient.getCredentials().getAuthToken())) {
-            reusedClient.setCredentials(recentCredentials);
-        }
-
+    private void keepCredentialsUpdated(Context context, OwnCloudAccount account, OwnCloudClient reusedClient) throws OperationCanceledException, AuthenticatorException, IOException {
+        account.loadCredentials(context);
+        reusedClient.setCredentials(account.getCredentials());
     }
 
     // this method is just a patch; we need to distinguish accounts in the same host but