diff --git a/.maestro/signin/14-scanner-camera.yaml b/.maestro/signin/14-scanner-camera.yaml
index 6e81d171..94b0c4f8 100644
--- a/.maestro/signin/14-scanner-camera.yaml
+++ b/.maestro/signin/14-scanner-camera.yaml
@@ -11,7 +11,7 @@ tags:
       CAMERA: deny
 - tapOn: "Scan a sign-in code.*"
 - extendedWaitUntil:
-    visible: "Camera access is turned off.*|Scanning a sign-in QR code uses the camera.*"
+    visible: "Camera access is.*|Scanning a sign-in QR code uses the camera.*"
     timeout: 15000
 - takeScreenshot: scanner-01-denied
 - tapOn: "Close"
diff --git a/.maestro/subflows/inbox.yaml b/.maestro/subflows/inbox.yaml
index 83b7905c..59c67a0e 100644
--- a/.maestro/subflows/inbox.yaml
+++ b/.maestro/subflows/inbox.yaml
@@ -11,6 +11,9 @@ appId: org.bulwarkmail.mobile
       visible: "Not now"
     commands:
       - tapOn: "Not now"
+# Adding an account from Settings returns to Settings.
+- tapOn:
+    id: tab-mail
 - extendedWaitUntil:
     visible:
       id: email-row
diff --git a/.maestro/subflows/sign-out.yaml b/.maestro/subflows/sign-out.yaml
index e41c0aa4..4937f27a 100644
--- a/.maestro/subflows/sign-out.yaml
+++ b/.maestro/subflows/sign-out.yaml
@@ -11,6 +11,7 @@ appId: org.bulwarkmail.mobile
 - extendedWaitUntil:
     visible: "The account is removed from this device.*"
     timeout: 10000
+# The dialog's button, not the Settings row of the same name behind it.
 - tapOn:
     text: "Sign out"
-    below: "The account is removed from this device.*"
+    rightOf: "Cancel"
diff --git a/.maestro/subflows/stalwart-login-page.yaml b/.maestro/subflows/stalwart-login-page.yaml
index 48758942..d8db349a 100644
--- a/.maestro/subflows/stalwart-login-page.yaml
+++ b/.maestro/subflows/stalwart-login-page.yaml
@@ -6,16 +6,10 @@ appId: org.bulwarkmail.mobile
     visible: "you@example.com"
     timeout: 60000
 - takeScreenshot: stalwart-login-page
-- runFlow:
-    file: type-web.yaml
-    env:
-      HINT: "you@example.com"
-      TEXT: ${LOGIN}
-- runFlow:
-    file: type-web.yaml
-    env:
-      HINT: "••••••••"
-      TEXT: ${PASSWORD}
+- tapOn: "you@example.com"
+- inputText: ${LOGIN}
+- tapOn: "••••••••"
+- inputText: ${PASSWORD}
 - runFlow:
     when:
       true: ${TOTP == 'yes'}