diff --git a/android/app/src/main/java/com/naviapp/common/customview/BoxInputGroup.kt b/android/app/src/main/java/com/naviapp/common/customview/BoxInputGroup.kt
index 3fc45c9bb7..b55492ed01 100644
--- a/android/app/src/main/java/com/naviapp/common/customview/BoxInputGroup.kt
+++ b/android/app/src/main/java/com/naviapp/common/customview/BoxInputGroup.kt
@@ -113,6 +113,7 @@ class BoxInputGroup(context: Context, attributeSet: AttributeSet? = null) :
             )
             otpView.layoutParams = layoutParams
             binding.otpLayout.addView(otpView)
+            otpView.contentDescription = "${Constants.OTP}-$position"
             editTextBoxes.add(otpView.findViewById(R.id.otp_et))
             editTextBoxes.forEach { it.hideCutCopyMenuPopUp() }
         }
diff --git a/android/app/src/main/java/com/naviapp/utils/Constants.kt b/android/app/src/main/java/com/naviapp/utils/Constants.kt
index 476f397763..4a5463f01a 100644
--- a/android/app/src/main/java/com/naviapp/utils/Constants.kt
+++ b/android/app/src/main/java/com/naviapp/utils/Constants.kt
@@ -479,6 +479,7 @@ object Constants {
     const val SECTION_CONTENT_SIZE = 3
     const val PERMISSION_REQUIRED = "permissionRequired"
     const val INVESTMENT_TAB_INIT_LANDING_PAGE = "investment_tab_init_landing_page"
+    const val OTP = "otp"
 
     // Constants for Animation label
     object AnimationLabels {
diff --git a/android/app/src/main/res/layout/login_fragment.xml b/android/app/src/main/res/layout/login_fragment.xml
index 9dec7e0e40..bd695a9073 100644
--- a/android/app/src/main/res/layout/login_fragment.xml
+++ b/android/app/src/main/res/layout/login_fragment.xml
@@ -49,6 +49,7 @@
 
             <EditText
                 android:id="@+id/phone_edit"
+                android:contentDescription="loginNumber"
                 style="@style/PhoneNumberTextStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -109,6 +110,7 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/get_otp_btn"
             android:layout_width="0dp"
+            android:contentDescription="numberLoginButton"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/layout_dp_32"
             android:background="@color/outrageous_orange"
diff --git a/android/app/src/main/res/layout/otp_fragment.xml b/android/app/src/main/res/layout/otp_fragment.xml
index 90d1e7a6af..768a80e00c 100644
--- a/android/app/src/main/res/layout/otp_fragment.xml
+++ b/android/app/src/main/res/layout/otp_fragment.xml
@@ -141,6 +141,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/layout_dp_40"
+            android:contentDescription="otpLoginButton"
             android:background="@color/outrageous_orange"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@+id/no_call_disclaimer"
diff --git a/android/benchmark/src/main/java/com/naviapp/benchmark/home/HomePageScrollBenchmark.kt b/android/benchmark/src/main/java/com/naviapp/benchmark/home/HomePageScrollBenchmark.kt
index 366dbc65dd..5e0d6498cf 100644
--- a/android/benchmark/src/main/java/com/naviapp/benchmark/home/HomePageScrollBenchmark.kt
+++ b/android/benchmark/src/main/java/com/naviapp/benchmark/home/HomePageScrollBenchmark.kt
@@ -13,6 +13,7 @@ import androidx.benchmark.macro.StartupMode
 import androidx.benchmark.macro.junit4.MacrobenchmarkRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.naviapp.benchmark.utils.PACKAGE_NAME
+import com.naviapp.benchmark.utils.performLogin
 import com.naviapp.benchmark.utils.scrollHomePage
 import com.naviapp.benchmark.utils.startActivityAndAllowNotifications
 import com.naviapp.benchmark.utils.waitForHomePage
@@ -42,6 +43,7 @@ class HomePageScrollBenchmark {
                 startActivityAndAllowNotifications()
             }
         ) {
+            performLogin()
             waitForHomePage()
             scrollHomePage()
         }
diff --git a/android/benchmark/src/main/java/com/naviapp/benchmark/startup/StartupBenchmark.kt b/android/benchmark/src/main/java/com/naviapp/benchmark/startup/StartupBenchmark.kt
index 3a9c9e2423..aad9b3b2d4 100644
--- a/android/benchmark/src/main/java/com/naviapp/benchmark/startup/StartupBenchmark.kt
+++ b/android/benchmark/src/main/java/com/naviapp/benchmark/startup/StartupBenchmark.kt
@@ -10,19 +10,19 @@ package com.naviapp.benchmark.startup
 import androidx.benchmark.macro.BaselineProfileMode.Disable
 import androidx.benchmark.macro.BaselineProfileMode.Require
 import androidx.benchmark.macro.CompilationMode
-import androidx.benchmark.macro.StartupMode.COLD
+import androidx.benchmark.macro.StartupMode
 import androidx.benchmark.macro.StartupTimingMetric
 import androidx.benchmark.macro.junit4.MacrobenchmarkRule
-import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.naviapp.benchmark.utils.PACKAGE_NAME
-import com.naviapp.benchmark.utils.allowNotifications
+import com.naviapp.benchmark.utils.performLogin
 import com.naviapp.benchmark.utils.startActivityAndAllowNotifications
 import com.naviapp.benchmark.utils.waitForHomePageLoad
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(AndroidJUnit4ClassRunner::class)
+@RunWith(AndroidJUnit4::class)
 class StartupBenchmark {
     @get:Rule val benchmarkRule = MacrobenchmarkRule()
 
@@ -46,13 +46,11 @@ class StartupBenchmark {
             metrics = listOf(StartupTimingMetric()),
             compilationMode = compilationMode,
             iterations = 5,
-            startupMode = COLD,
-            setupBlock = {
-                pressHome()
-                allowNotifications()
-            },
+            startupMode = StartupMode.COLD,
+            setupBlock = { pressHome() },
         ) {
             startActivityAndAllowNotifications()
+            performLogin()
             waitForHomePageLoad()
         }
 }
diff --git a/android/benchmark/src/main/java/com/naviapp/benchmark/utils/HomePageActions.kt b/android/benchmark/src/main/java/com/naviapp/benchmark/utils/HomePageActions.kt
index 0f1ae63636..ef341cdbac 100644
--- a/android/benchmark/src/main/java/com/naviapp/benchmark/utils/HomePageActions.kt
+++ b/android/benchmark/src/main/java/com/naviapp/benchmark/utils/HomePageActions.kt
@@ -15,7 +15,35 @@ import androidx.test.uiautomator.Until
 import java.util.concurrent.TimeUnit
 
 fun MacrobenchmarkScope.waitForHomePage() {
-    device.wait(Until.hasObject(By.clazz(HOME_PAGE_CLASS_NAME)), TimeUnit.SECONDS.toMillis(50))
+    device.wait(Until.hasObject(By.clazz(HOME_PAGE_CLASS_NAME)), TimeUnit.SECONDS.toMillis(5))
+}
+
+fun MacrobenchmarkScope.performLogin() {
+    waitForLoginPage()
+    enterLoginCredentials()
+}
+
+fun MacrobenchmarkScope.enterLoginCredentials() {
+    if (!device.wait(Until.hasObject(By.desc("loginNumber")), TimeUnit.SECONDS.toMillis(10))) {
+        return
+    }
+    val loginNumber = device.waitAndFindObject(By.desc("loginNumber"), TimeUnit.SECONDS.toMillis(5))
+    loginNumber.text = "6666681798"
+
+    val numberLoginButton =
+        device.waitAndFindObject(By.desc("numberLoginButton"), TimeUnit.SECONDS.toMillis(5))
+    numberLoginButton.click()
+    val otpNumber0 = device.waitAndFindObject(By.desc("otp-1"), TimeUnit.SECONDS.toMillis(5))
+    otpNumber0.text = "1"
+    val otpNumber1 = device.waitAndFindObject(By.desc("otp-2"), TimeUnit.SECONDS.toMillis(5))
+    otpNumber1.text = "2"
+    val otpNumber2 = device.waitAndFindObject(By.desc("otp-3"), TimeUnit.SECONDS.toMillis(5))
+    otpNumber2.text = "3"
+    val otpNumber3 = device.waitAndFindObject(By.desc("otp-4"), TimeUnit.SECONDS.toMillis(5))
+    otpNumber3.text = "4"
+    val otpLoginButton =
+        device.waitAndFindObject(By.desc("otpLoginButton"), TimeUnit.SECONDS.toMillis(5))
+    otpLoginButton.click()
 }
 
 fun MacrobenchmarkScope.scrollHomePage() {
@@ -25,10 +53,14 @@ fun MacrobenchmarkScope.scrollHomePage() {
 }
 
 fun MacrobenchmarkScope.waitForHomePageLoad() {
-    device.wait(Until.hasObject(By.clazz(HOME_PAGE_CLASS_NAME)), TimeUnit.SECONDS.toMillis(50))
+    device.wait(Until.hasObject(By.clazz(HOME_PAGE_CLASS_NAME)), TimeUnit.SECONDS.toMillis(10))
     val list =
         device.waitAndFindObject(By.res("homeScreenWidgetsList"), TimeUnit.SECONDS.toMillis(10))
-    list.wait(untilHasChildren(), 60_000)
+    list.wait(untilHasChildren(), 5000)
+}
+
+fun MacrobenchmarkScope.waitForLoginPage() {
+    device.wait(Until.hasObject(By.clazz(LOGIN_PAGE_CLASS_NAME)), TimeUnit.SECONDS.toMillis(10))
 }
 
 fun untilHasChildren(
diff --git a/android/benchmark/src/main/java/com/naviapp/benchmark/utils/Utils.kt b/android/benchmark/src/main/java/com/naviapp/benchmark/utils/Utils.kt
index 80d5328d8b..31bbc94895 100644
--- a/android/benchmark/src/main/java/com/naviapp/benchmark/utils/Utils.kt
+++ b/android/benchmark/src/main/java/com/naviapp/benchmark/utils/Utils.kt
@@ -18,6 +18,7 @@ val PACKAGE_NAME = buildString { append("com.naviapp.dev") }
 val HOME_PAGE_CLASS_NAME = buildString {
     append("com.naviapp.home.compose.activity.HomePageActivity")
 }
+val LOGIN_PAGE_CLASS_NAME = buildString { append("com.naviapp.registration.RegistrationActivity") }
 
 fun UiDevice.waitAndFindObject(selector: BySelector, timeout: Long): UiObject2 {
     if (!wait(Until.hasObject(selector), timeout)) {