diff --git a/src/com/owncloud/android/lib/common/OwnCloudBasicCredentials.java b/src/com/owncloud/android/lib/common/OwnCloudBasicCredentials.java
index 35ef6c4b..ac22441b 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudBasicCredentials.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudBasicCredentials.java
@@ -47,7 +47,7 @@ public class OwnCloudBasicCredentials implements OwnCloudCredentials {
         client.getParams().setParameter(AuthPolicy.AUTH_SCHEME_PRIORITY, authPrefs);        
         
         client.getParams().setAuthenticationPreemptive(true);
-        client.getParams().setCredentialCharset(CREDENTIAL_CHARSET);
+        client.getParams().setCredentialCharset(OwnCloudCredentialsFactory.CREDENTIAL_CHARSET);
         client.getState().setCredentials(
         		AuthScope.ANY, 
         		new UsernamePasswordCredentials(mUsername, mPassword)
diff --git a/src/com/owncloud/android/lib/common/OwnCloudBearerCredentials.java b/src/com/owncloud/android/lib/common/OwnCloudBearerCredentials.java
index 912aa0b9..36a81d1d 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudBearerCredentials.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudBearerCredentials.java
@@ -49,7 +49,7 @@ public class OwnCloudBearerCredentials implements OwnCloudCredentials {
 	    client.getParams().setParameter(AuthPolicy.AUTH_SCHEME_PRIORITY, authPrefs);        
 	    
 	    client.getParams().setAuthenticationPreemptive(true);
-        client.getParams().setCredentialCharset(CREDENTIAL_CHARSET);
+        client.getParams().setCredentialCharset(OwnCloudCredentialsFactory.CREDENTIAL_CHARSET);
 	    client.getState().setCredentials(
 	    		AuthScope.ANY, 
 	    		new BearerCredentials(mAccessToken)
diff --git a/src/com/owncloud/android/lib/common/OwnCloudCredentials.java b/src/com/owncloud/android/lib/common/OwnCloudCredentials.java
index 61492937..96a727e6 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudCredentials.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudCredentials.java
@@ -25,7 +25,6 @@
 package com.owncloud.android.lib.common;
 
 public interface OwnCloudCredentials {
-	public static final String CREDENTIAL_CHARSET = "UTF-8";
 
 	public void applyTo(OwnCloudClient ownCloudClient);
 
diff --git a/src/com/owncloud/android/lib/common/OwnCloudCredentialsFactory.java b/src/com/owncloud/android/lib/common/OwnCloudCredentialsFactory.java
index e854fd67..ead7cc8f 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudCredentialsFactory.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudCredentialsFactory.java
@@ -26,6 +26,8 @@ package com.owncloud.android.lib.common;
 
 public class OwnCloudCredentialsFactory {
 
+	public static final String CREDENTIAL_CHARSET = "UTF-8";
+
 	private static OwnCloudAnonymousCredentials sAnonymousCredentials;
 
 	public static OwnCloudCredentials newBasicCredentials(String username, String password) {
diff --git a/src/com/owncloud/android/lib/common/OwnCloudSamlSsoCredentials.java b/src/com/owncloud/android/lib/common/OwnCloudSamlSsoCredentials.java
index 25fa3fbd..f84b78a4 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudSamlSsoCredentials.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudSamlSsoCredentials.java
@@ -41,7 +41,7 @@ public class OwnCloudSamlSsoCredentials implements OwnCloudCredentials {
 	@Override
 	public void applyTo(OwnCloudClient client) {
         client.getParams().setAuthenticationPreemptive(false);
-        client.getParams().setCredentialCharset(CREDENTIAL_CHARSET);
+        client.getParams().setCredentialCharset(OwnCloudCredentialsFactory.CREDENTIAL_CHARSET);
         client.getParams().setCookiePolicy(CookiePolicy.BROWSER_COMPATIBILITY);
         client.setFollowRedirects(false);