diff --git a/owncloudComLibrary/build.gradle b/owncloudComLibrary/build.gradle
index e9f20869..c98d293f 100644
--- a/owncloudComLibrary/build.gradle
+++ b/owncloudComLibrary/build.gradle
@@ -7,6 +7,8 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
     api 'com.gitlab.ownclouders:dav4android:oc_support_2.1.5'
     api 'com.github.AppDevNext.Logcat:LogcatCore:2.2.2'
+    debugImplementation 'com.facebook.stetho:stetho:1.5.1'
+    debugImplementation 'com.facebook.stetho:stetho-okhttp3:1.5.1'
 
     // Moshi
     implementation("com.squareup.moshi:moshi-kotlin:$moshiVersion") {
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/ConnectionValidator.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/ConnectionValidator.kt
index a052924f..70ee7136 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/ConnectionValidator.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/ConnectionValidator.kt
@@ -21,7 +21,7 @@ class ConnectionValidator (
             var validationRetryCount = 0
             val client = OwnCloudClient(baseClient.baseUri, null, false)
             if (clearCookiesOnValidation) {
-                client.clearCookies()
+                client.clearCookies();
             } else {
                 client.cookiesForBaseUri = baseClient.cookiesForBaseUri
             }
@@ -84,7 +84,7 @@ class ConnectionValidator (
     }
 
     private fun triggerAuthRefresh(): OwnCloudCredentials {
-        //TODO: Implement me
+        Timber.d("!!!!!!!!!!!!!!!!!!!!!!!!!!!! need to reauthenticate !!!!!!!!!!!!!!!!!!!!!!!!!!")
         return OwnCloudCredentialsFactory.getAnonymousCredentials()
     }
 
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java
index eb3432b2..330a09fa 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -340,10 +340,6 @@ public class OwnCloudClient extends HttpClient {
                     HttpUrl.parse(mBaseUri.toString()));
     }
 
-    public void clearCookies() {
-        setCookiesForBaseUri(new ArrayList<>());
-    }
-
     public OwnCloudVersion getOwnCloudVersion() {
         return mVersion;
     }
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/CookieJarImpl.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/CookieJarImpl.kt
index ae76424e..ec355cd7 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/CookieJarImpl.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/CookieJarImpl.kt
@@ -28,7 +28,7 @@ import okhttp3.CookieJar
 import okhttp3.HttpUrl
 
 class CookieJarImpl(
-    private val sCookieStore: HashMap<String, List<Cookie>>
+    private val cookieStore: HashMap<String, List<Cookie>>
 ) : CookieJar {
 
     fun containsCookieWithName(cookies: List<Cookie>, name: String): Boolean {
@@ -52,12 +52,11 @@ class CookieJarImpl(
 
     override fun saveFromResponse(url: HttpUrl, cookies: List<Cookie>) {
         // Avoid duplicated cookies but update
-        val currentCookies: List<Cookie> = sCookieStore[url.host] ?: ArrayList()
+        val currentCookies: List<Cookie> = cookieStore[url.host] ?: ArrayList()
         val updatedCookies: List<Cookie> = getUpdatedCookies(currentCookies, cookies)
-        sCookieStore[url.host] = updatedCookies
+        cookieStore[url.host] = updatedCookies
     }
 
     override fun loadForRequest(url: HttpUrl) =
-        sCookieStore[url.host] ?: ArrayList()
-
-}
+        cookieStore[url.host] ?: ArrayList()
+}
\ No newline at end of file
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/HttpClient.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/HttpClient.java
index b231ffed..f1089f5e 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/HttpClient.java
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/HttpClient.java
@@ -26,6 +26,7 @@ package com.owncloud.android.lib.common.http;
 
 import android.content.Context;
 
+import com.facebook.stetho.okhttp3.StethoInterceptor;
 import com.owncloud.android.lib.common.network.AdvancedX509TrustManager;
 import com.owncloud.android.lib.common.network.NetworkUtils;
 import okhttp3.Cookie;
@@ -139,4 +140,8 @@ public class HttpClient {
     public static void setContext(Context context) {
         sContext = context;
     }
+
+    public void clearCookies() {
+        sCookieStore.clear();
+    }
 }