diff --git a/app/src/main/java/com/nextcloud/client/account/AnonymousUser.kt b/app/src/main/java/com/nextcloud/client/account/AnonymousUser.kt
index 746e999904eb..64e8feef41f6 100644
--- a/app/src/main/java/com/nextcloud/client/account/AnonymousUser.kt
+++ b/app/src/main/java/com/nextcloud/client/account/AnonymousUser.kt
@@ -49,8 +49,16 @@ internal data class AnonymousUser(private val accountType: String) :
     override val server = Server(URI.create(""), MainApp.MINIMUM_SUPPORTED_SERVER_VERSION)
     override val isAnonymous = true
 
+    @Deprecated(
+        "Temporary workaround: Legacy Android Account access. Refactor code to use User object " +
+            "directly instead of platform Account."
+    )
     override fun toPlatformAccount(): Account = Account(accountName, accountType)
 
+    @Deprecated(
+        "Temporary workaround: Legacy OwnCloudAccount access. Refactor code to use User object " +
+            "directly instead of OwnCloudAccount."
+    )
     override fun toOwnCloudAccount(): OwnCloudAccount = OwnCloudAccount(Uri.EMPTY, OwnCloudBasicCredentials("", ""))
 
     override fun nameEquals(user: User?): Boolean = user?.accountName.equals(accountName, true)
diff --git a/app/src/main/java/com/nextcloud/client/account/MockUser.kt b/app/src/main/java/com/nextcloud/client/account/MockUser.kt
index 7cbf71773d09..abf90b58875a 100644
--- a/app/src/main/java/com/nextcloud/client/account/MockUser.kt
+++ b/app/src/main/java/com/nextcloud/client/account/MockUser.kt
@@ -44,8 +44,16 @@ data class MockUser(override val accountName: String, val accountType: String) :
     override val server = Server(URI.create(""), MainApp.MINIMUM_SUPPORTED_SERVER_VERSION)
     override val isAnonymous = false
 
+    @Deprecated(
+        "Temporary workaround: Legacy Android Account access. Refactor code to use User object " +
+            "directly instead of platform Account."
+    )
     override fun toPlatformAccount(): Account = Account(accountName, accountType)
 
+    @Deprecated(
+        "Temporary workaround: Legacy OwnCloudAccount access. Refactor code to use User object " +
+            "directly instead of OwnCloudAccount."
+    )
     override fun toOwnCloudAccount(): OwnCloudAccount = OwnCloudAccount(Uri.EMPTY, OwnCloudBasicCredentials("", ""))
 
     override fun nameEquals(user: User?): Boolean = user?.accountName.equals(accountName, true)
diff --git a/app/src/main/java/com/nextcloud/client/account/RegisteredUser.kt b/app/src/main/java/com/nextcloud/client/account/RegisteredUser.kt
index d73a99a747fb..cce88ac0c6bc 100644
--- a/app/src/main/java/com/nextcloud/client/account/RegisteredUser.kt
+++ b/app/src/main/java/com/nextcloud/client/account/RegisteredUser.kt
@@ -41,8 +41,16 @@ internal data class RegisteredUser(
         return account.name
     }
 
+    @Deprecated(
+        "Temporary workaround: Legacy Android Account access. Refactor code to use User object " +
+            "directly instead of platform Account."
+    )
     override fun toPlatformAccount(): Account = account
 
+    @Deprecated(
+        "Temporary workaround: Legacy OwnCloudAccount access. Refactor code to use User object " +
+            "directly instead of OwnCloudAccount."
+    )
     override fun toOwnCloudAccount(): OwnCloudAccount = ownCloudAccount
 
     override fun nameEquals(user: User?): Boolean = nameEquals(user?.accountName)
diff --git a/app/src/main/java/com/nextcloud/client/account/User.kt b/app/src/main/java/com/nextcloud/client/account/User.kt
index 856bb0b53f8f..1a7da61d61f7 100644
--- a/app/src/main/java/com/nextcloud/client/account/User.kt
+++ b/app/src/main/java/com/nextcloud/client/account/User.kt
@@ -27,7 +27,10 @@ interface User :
      *
      * @return Account instance that is associated with this User object.
      */
-    @Deprecated("Temporary workaround")
+    @Deprecated(
+        "Temporary workaround: Legacy Android Account access. Refactor code to use User object " +
+            "directly instead of platform Account."
+    )
     override fun toPlatformAccount(): Account
 
     /**
@@ -39,7 +42,10 @@ interface User :
      *
      * @return OwnCloudAccount instance that is associated with this User object.
      */
-    @Deprecated("Temporary workaround")
+    @Deprecated(
+        "Temporary workaround: Legacy OwnCloudAccount access. Refactor code to use User object " +
+            "directly instead of OwnCloudAccount."
+    )
     fun toOwnCloudAccount(): OwnCloudAccount
 
     /**