diff --git a/__e2e__/flows/login.yml b/__e2e__/flows/login.yml
index ba6b79ac48..14c7259f16 100644
--- a/__e2e__/flows/login.yml
+++ b/__e2e__/flows/login.yml
@@ -11,7 +11,8 @@ appId: xyz.blueskyweb.app
 - tapOn: "Sign in"
 - tapOn:
     id: "selectServiceButton"
-- tapOn: "Custom"
+- tapOn:
+    id: "manualSelectBtn"
 - tapOn:
     id: "customServerTextInput"
 - inputText: "http://localhost:3000"
@@ -20,7 +21,8 @@ appId: xyz.blueskyweb.app
       platform: Android
     commands:
       - hideKeyboard
-- tapOn: "Done"
+- tapOn:
+    id: "doneBtn"
 - tapOn:
     id: "loginUsernameInput"
 - inputText: "Alice"
diff --git a/src/screens/Login/LoginForm.tsx b/src/screens/Login/LoginForm.tsx
index 17e97efa09..27361219ec 100644
--- a/src/screens/Login/LoginForm.tsx
+++ b/src/screens/Login/LoginForm.tsx
@@ -640,6 +640,7 @@ function HostingProviderIndicator({
 
   return (
     <Button
+      testID="selectServiceButton"
       label={l`Change hosting provider`}
       accessibilityHint={l`Opens a dialog to change the hosting provider you sign in to`}
       style={[!gtMobile && [a.mt_auto, a.mb_sm, a.self_center]]}