diff --git a/src/App/Pages/Accounts/SetPasswordPage.xaml b/src/App/Pages/Accounts/SetPasswordPage.xaml
index c026e9fe7..23388a9c4 100644
--- a/src/App/Pages/Accounts/SetPasswordPage.xaml
+++ b/src/App/Pages/Accounts/SetPasswordPage.xaml
@@ -51,7 +51,8 @@
+ HorizontalTextAlignment="Start"
+ AutomationId="ResetPasswordAutoEnrollInviteWarningLabel" />
+ HorizontalTextAlignment="Start"
+ AutomationId="PolicyInEffectLabel" />
@@ -98,7 +100,8 @@
IsTextPredictionEnabled="False"
IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
Grid.Row="1"
- Grid.Column="0" />
+ Grid.Column="0"
+ AutomationId="MasterPasswordField" />
+ AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
+ AutomationId="ToggleMasterPasswordVisibilityButton" />
+ Grid.Column="0"
+ AutomationId="RetypePasswordField" />
+ AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
+ AutomationId="ToggleRetypePasswordVisibilityButton" />
+ ReturnCommand="{Binding SubmitCommand}"
+ AutomationId="MasterPasswordHintLabel" />