diff --git a/app/src/androidTestLibrary/java/com/naviapp/controllers/useridentification/PanController.kt b/app/src/androidTestLibrary/java/com/naviapp/controllers/useridentification/PanController.kt
index 45b94bc956..a39a982349 100644
--- a/app/src/androidTestLibrary/java/com/naviapp/controllers/useridentification/PanController.kt
+++ b/app/src/androidTestLibrary/java/com/naviapp/controllers/useridentification/PanController.kt
@@ -49,7 +49,7 @@ class PanController : Controller() {
     fun enterPan(panNumber: String? = null): PanController {
         verifyOnThisActivity()
         onView(panFieldMatcher).perform(
-            replaceText(
+            typeText(
                 panNumber ?: RandomGenerator.getRandomPanNumber()
             )
         )
@@ -76,9 +76,10 @@ class PanController : Controller() {
     }
 
     fun enterAge(ageDay: String, ageMonth: String, ageYear: String): PanController {
-        onView(ageDayMatcher).perform(replaceText(ageDay))
-        onView(ageMonthMatcher).perform(replaceText(ageMonth))
-        onView(ageYearMatcher).perform(replaceText(ageYear))
+        onView(ageDayMatcher).perform(typeText(ageDay))
+        onView(ageMonthMatcher).perform(typeText(ageMonth))
+        onView(ageYearMatcher).perform(typeText(ageYear))
+        closeSoftKeyboard()
         Log.i(TAG, "Age entered on profile page")
         return this
     }