diff --git a/src/App/Pages/Accounts/LoginApproveDevicePage.xaml b/src/App/Pages/Accounts/LoginApproveDevicePage.xaml
index 42edf6371..9b04ec84f 100644
--- a/src/App/Pages/Accounts/LoginApproveDevicePage.xaml
+++ b/src/App/Pages/Accounts/LoginApproveDevicePage.xaml
@@ -18,15 +18,16 @@
             <StackLayout HorizontalOptions="FillAndExpand">
                 <Label
                     StyleClass="text-md"
-                    Text="{u:I18n RememberThisDevice}"/>
+                    Text="{u:I18n RememberThisDevice}" />
                 <Label
                     StyleClass="box-sub-label"
-                    Text="{u:I18n TurnOffUsingPublicDevice}"/>
+                    Text="{u:I18n TurnOffUsingPublicDevice}" />
             </StackLayout>
             <Switch
                 Scale="0.8"
                 IsToggled="{Binding RememberThisDevice}"
-                VerticalOptions="Center"/>
+                AutomationId="RememberThisDeviceSwitch"
+                VerticalOptions="Center" />
         </StackLayout>
         <StackLayout Margin="0, 20, 0, 0">
             <Button
@@ -34,31 +35,34 @@
                 Text="{u:I18n Continue}" 
                 StyleClass="btn-primary"
                 Command="{Binding ContinueCommand}"
-                IsVisible="{Binding IsNewUser}"/>
+                IsVisible="{Binding IsNewUser}"
+                AutomationId="ContinueButton" />
             <Button
                 x:Name="_approveWithMyOtherDevice"
                 Text="{u:I18n ApproveWithMyOtherDevice}" 
                 StyleClass="btn-primary"
                 Command="{Binding ApproveWithMyOtherDeviceCommand}"
-                IsVisible="{Binding ApproveWithMyOtherDeviceEnabled}"/>
+                IsVisible="{Binding ApproveWithMyOtherDeviceEnabled}"
+                AutomationId="ApproveWithMyOtherDeviceButton" />
             <Button
                 x:Name="_requestAdminApproval"
                 Text="{u:I18n RequestAdminApproval}" 
                 StyleClass="box-button-row"
                 Command="{Binding RequestAdminApprovalCommand}"
-                IsVisible="{Binding RequestAdminApprovalEnabled}"/>
+                IsVisible="{Binding RequestAdminApprovalEnabled}"
+                AutomationId="RequestAdminApprovalButton" />
             <Button
                 x:Name="_approveWithMasterPassword"
                 Text="{u:I18n ApproveWithMasterPassword}" 
                 StyleClass="box-button-row"
                 Command="{Binding ApproveWithMasterPasswordCommand}"
-                IsVisible="{Binding ApproveWithMasterPasswordEnabled}"/>
+                IsVisible="{Binding ApproveWithMasterPasswordEnabled}"
+                AutomationId="ApproveWithMasterPasswordButton" />
             <Label
                 Text="{Binding LoggingInAsText}"
                 StyleClass="text-sm"
                 Margin="0,40,0,0"
-                AutomationId="LoggingInAsLabel"
-                />
+                AutomationId="LoggingInAsLabel" />
             <Label
                 Text="{u:I18n NotYou}"
                 StyleClass="text-md"
diff --git a/src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml b/src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml
index f7cac07af..379039f46 100644
--- a/src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml
+++ b/src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml
@@ -14,7 +14,7 @@
     </ContentPage.BindingContext>
 
     <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{u:I18n Close}" Command="{Binding CloseCommand}" Order="Primary" Priority="-1" x:Name="_closeItem"/>
+        <ToolbarItem Text="{u:I18n Close}" Command="{Binding CloseCommand}" Order="Primary" Priority="-1" x:Name="_closeItem" />
     </ContentPage.ToolbarItems>
 
     <ScrollView>
@@ -29,15 +29,17 @@
             <Label
                 Text="{Binding SubTitle}"
                 FontSize="Small"
-                Margin="0,0,0,10"/>
+                Margin="0,0,0,10"
+                AutomationId="SubTitleLabel" />
             <Label
                 Text="{Binding Description}"
                 FontSize="Small"
-                Margin="0,0,0,24"/>
+                Margin="0,0,0,24"
+                AutomationId="DescriptionLabel" />
             <Label
                 Text="{u:I18n FingerprintPhrase}"
                 FontSize="Small"
-                FontAttributes="Bold"/>
+                FontAttributes="Bold" />
             <controls:MonoLabel
                 FormattedText="{Binding FingerprintPhrase}"
                 FontSize="Small"
@@ -62,7 +64,7 @@
                 Color="{DynamicResource DisabledIconColor}" />
             <Label
                 Text="{Binding OtherOptions}"
-                FontSize="Small"/>
+                FontSize="Small" />
             <Label
                 Text="{u:I18n ViewAllLoginOptions}"
                 StyleClass="text-sm"
diff --git a/src/App/Pages/Accounts/LoginSsoPage.xaml b/src/App/Pages/Accounts/LoginSsoPage.xaml
index 3c6fd941d..8a4d490ce 100644
--- a/src/App/Pages/Accounts/LoginSsoPage.xaml
+++ b/src/App/Pages/Accounts/LoginSsoPage.xaml
@@ -21,7 +21,7 @@
             <StackLayout StyleClass="box">
                 <Label Text="{u:I18n LogInSsoSummary}"
                    StyleClass="text-md"
-                   HorizontalTextAlignment="Start"></Label>
+                   HorizontalTextAlignment="Start" />
                 <StackLayout StyleClass="box-row">
                     <Label
                         Text="{u:I18n OrgIdentifier}"
@@ -32,13 +32,15 @@
                         Keyboard="Default"
                         StyleClass="box-value" 
                         ReturnType="Go"
-                        ReturnCommand="{Binding LogInCommand}" />
+                        ReturnCommand="{Binding LogInCommand}" 
+                        AutomationId="OrgIdentifierEntry" />
                 </StackLayout>
             </StackLayout>
             <StackLayout Padding="10, 0">
                 <Button Text="{u:I18n LogIn}"
                         StyleClass="btn-primary"
-                        Clicked="LogIn_Clicked"></Button>
+                        Clicked="LogIn_Clicked"
+                        AutomationId="LogInButton" />
             </StackLayout>
         </StackLayout>
     </ScrollView>