diff --git a/app/src/androidTest/java/com/nextcloud/talk/data/database/dao/ChatBlocksDaoTest.kt b/app/src/androidTest/java/com/nextcloud/talk/data/database/dao/ChatBlocksDaoTest.kt
index 022163676..01067b1b9 100644
--- a/app/src/androidTest/java/com/nextcloud/talk/data/database/dao/ChatBlocksDaoTest.kt
+++ b/app/src/androidTest/java/com/nextcloud/talk/data/database/dao/ChatBlocksDaoTest.kt
@@ -26,6 +26,8 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import java.lang.Boolean
+import kotlin.Long
+import kotlin.String
 
 @RunWith(AndroidJUnit4::class)
 class ChatBlocksDaoTest {
@@ -58,6 +60,7 @@ class ChatBlocksDaoTest {
             val account1 = usersDao.getUserWithUserId("account1").blockingGet()
 
             conversationsDao.upsertConversations(
+                accountId = user.id,
                 listOf(
                     createConversationEntity(
                         accountId = account1.id,
diff --git a/app/src/main/java/com/nextcloud/talk/account/BrowserLoginActivity.kt b/app/src/main/java/com/nextcloud/talk/account/BrowserLoginActivity.kt
index f35607f20..39b80ccba 100644
--- a/app/src/main/java/com/nextcloud/talk/account/BrowserLoginActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/account/BrowserLoginActivity.kt
@@ -85,6 +85,7 @@ class BrowserLoginActivity : BaseActivity() {
     private val loginFlowExecutorService: ScheduledExecutorService? = Executors.newSingleThreadScheduledExecutor()
     private var isLoginProcessCompleted = false
     private var token: String = ""
+    private var pollUrl: String = ""
 
     private lateinit var okHttpClient: OkHttpClient
 
@@ -163,6 +164,7 @@ class BrowserLoginActivity : BaseActivity() {
                     launchDefaultWebBrowser(loginUrl)
                 }
                 token = jsonObject.getAsJsonObject("poll").get("token").asString
+                pollUrl = jsonObject.getAsJsonObject("poll").get("endpoint").asString
             } catch (e: SSLHandshakeException) {
                 Log.e(TAG, "Error caught at anonymouslyPostLoginRequest: $e")
             }
@@ -215,14 +217,12 @@ class BrowserLoginActivity : BaseActivity() {
     }
 
     private fun performLoginFlowV2() {
-        val postRequestUrl = "$baseUrl/login/v2/poll"
-
         val requestBody: RequestBody = FormBody.Builder()
             .add("token", token)
             .build()
 
         val request = Request.Builder()
-            .url(postRequestUrl)
+            .url(pollUrl)
             .post(requestBody)
             .build()