diff --git a/IdentityCore/tests/automation/ui_tests_lib/MSIDBaseUITest.m b/IdentityCore/tests/automation/ui_tests_lib/MSIDBaseUITest.m
index b940fc1b2..1279298c1 100644
--- a/IdentityCore/tests/automation/ui_tests_lib/MSIDBaseUITest.m
+++ b/IdentityCore/tests/automation/ui_tests_lib/MSIDBaseUITest.m
@@ -315,7 +315,7 @@ - (void)enterPassword:(NSString *)password app:(XCUIApplication *)application is
     XCUIElement *passwordSecureTextField = [application.secureTextFields elementBoundByIndex:0];
     // This is explicitly to check the new screen where to ask user to signin with the following 2 options. This caused several automation failures
     
-    XCTWaiterResult result = [self waitForElementsAndContinue:passwordSecureTextField];
+    XCTWaiterResult result = [self waitForElementsAndContinueIfNotAppear:passwordSecureTextField];
     if (result == XCTWaiterResultCompleted)
     {
         [self tapElementAndWaitForKeyboardToAppear:passwordSecureTextField app:application];
@@ -327,7 +327,7 @@ - (void)enterPassword:(NSString *)password app:(XCUIApplication *)application is
         // 1. Use my password
         // 2. Sign in to an orgnization
         XCUIElement *useMyPasswordButton = application.buttons[@"Use my password"];
-        result = [self waitForElementsAndContinue:useMyPasswordButton];
+        result = [self waitForElementsAndContinueIfNotAppear:useMyPasswordButton];
         if (result == XCTWaiterResultCompleted)
         {
             [useMyPasswordButton tap];