diff --git a/tests/screenobjects/account-creation/CreatePinScreen.ts b/tests/screenobjects/account-creation/CreatePinScreen.ts
index f1624be405..1362150388 100644
--- a/tests/screenobjects/account-creation/CreatePinScreen.ts
+++ b/tests/screenobjects/account-creation/CreatePinScreen.ts
@@ -98,9 +98,17 @@ class CreatePinScreen extends UplinkMainScreen {
   }
 
   async enterPinOnLogin(pin: string) {
+    await this.pinInput.waitForExist();
     const pinInput = await this.pinInput;
-    await pinInput.click();
+    await pinInput.clearValue();
     await pinInput.setValue(pin);
+
+    const pinToEnterLength = pin.length;
+    const expectedMaskedPin = "•".repeat(pinToEnterLength);
+    const maskedPin = await pinInput.getText();
+    if (maskedPin !== expectedMaskedPin) {
+      await this.enterPinOnCreateAccount(pin);
+    }
   }
 
   async enterPinOnCreateAccount(pin: string) {
diff --git a/tests/screenobjects/settings/SettingsAccessibilityScreen.ts b/tests/screenobjects/settings/SettingsAccessibilityScreen.ts
index 0b7f124cff..e14f0edf89 100644
--- a/tests/screenobjects/settings/SettingsAccessibilityScreen.ts
+++ b/tests/screenobjects/settings/SettingsAccessibilityScreen.ts
@@ -15,6 +15,7 @@ const SELECTORS_WINDOWS: selectorContainer = {
   SETTINGS_INFO: '[name="settings-info"]',
   SETTINGS_INFO_DESCRIPTION: "<Text>[2]",
   SETTINGS_INFO_HEADER: "//Text[1]/Text",
+  SETTINGS_LAYOUT: '[name="settings-layout"]',
   SWITCH_SLIDER: '[name="Switch Slider"]',
 };
 
@@ -26,6 +27,7 @@ const SELECTORS_MACOS: selectorContainer = {
   SETTINGS_INFO_DESCRIPTION:
     "-ios class chain:**/XCUIElementTypeGroup/XCUIElementTypeStaticText",
   SETTINGS_INFO_HEADER: "-ios class chain:**/XCUIElementTypeStaticText[1]",
+  SETTINGS_LAYOUT: "~settings-layout",
   SWITCH_SLIDER: "~Switch Slider",
 };
 
@@ -35,7 +37,7 @@ process.env.DRIVER === WINDOWS_DRIVER
 
 class SettingsAccessibilityScreen extends SettingsBaseScreen {
   constructor() {
-    super(SELECTORS.OPEN_DYSLEXIC_SECTION);
+    super(SELECTORS.SETTINGS_LAYOUT);
   }
 
   public get openDyslexicCheckbox() {
@@ -63,7 +65,11 @@ class SettingsAccessibilityScreen extends SettingsBaseScreen {
   }
 
   public get openDyslexicSection() {
-    return $(SELECTORS.OPEN_DYSLEXIC_SECTION);
+    return this.settingsLayout.$(SELECTORS.OPEN_DYSLEXIC_SECTION);
+  }
+
+  public get settingsLayout() {
+    return $(SELECTORS.SETTINGS_LAYOUT);
   }
 
   async clickOnOpenDyslexic() {