diff --git a/app/src/gplay/AndroidManifest.xml b/app/src/gplay/AndroidManifest.xml
index 23ad1e6bb..8992dabc4 100644
--- a/app/src/gplay/AndroidManifest.xml
+++ b/app/src/gplay/AndroidManifest.xml
@@ -24,12 +24,14 @@
 
     <application
         android:name=".application.NextcloudTalkApplication"
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:fullBackupContent="@xml/backup_config"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/nc_app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true"
+        android:allowClearUserData="false"
+        android:allowClearUserDataOnFailedRestore="true"
         android:theme="@style/AppTheme"
         tools:replace="label, icon, theme, name, allowBackup"
         tools:ignore="UnusedAttribute, ExportedService">
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 00c215f25..11fbb352c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -62,8 +62,10 @@
 
     <application
         android:name=".application.NextcloudTalkApplication"
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:fullBackupContent="@xml/backup_config"
+        android:allowClearUserData="false"
+        android:allowClearUserDataOnFailedRestore="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/nc_app_name"
         android:largeHeap="true"
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.kt b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.kt
index 8a79ed2dd..62f649730 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.kt
@@ -697,6 +697,7 @@ class SettingsController : BaseController() {
                         avatarId, R.dimen.avatar_size_big
                 )
         ) {
+            addHeader("Authorization", currentUser!!.getCredentials())
             transformations(CircleCropTransformation())
         }
     }
diff --git a/app/src/main/java/com/nextcloud/talk/newarch/utils/NetworkUtils.kt b/app/src/main/java/com/nextcloud/talk/newarch/utils/NetworkUtils.kt
index cf2c7aaac..23545e3c6 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/utils/NetworkUtils.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/utils/NetworkUtils.kt
@@ -31,8 +31,7 @@ import java.net.Proxy.NO_PROXY
 import java.net.Proxy.Type
 import java.net.Proxy.Type.SOCKS
 
-class NetworkUtils {
-    class HeadersInterceptor : Interceptor {
+class NetworkUtils { class HeadersInterceptor : Interceptor {
 
         @Throws(IOException::class)
         override fun intercept(chain: Interceptor.Chain): Response {