diff --git a/src/App/Pages/Accounts/EnvironmentPage.xaml b/src/App/Pages/Accounts/EnvironmentPage.xaml
index cabf07ed7..73a1beb04 100644
--- a/src/App/Pages/Accounts/EnvironmentPage.xaml
+++ b/src/App/Pages/Accounts/EnvironmentPage.xaml
@@ -34,7 +34,8 @@
Placeholder="ex. https://bitwarden.company.com"
StyleClass="box-value"
ReturnType="Go"
- ReturnCommand="{Binding SubmitCommand}" />
+ ReturnCommand="{Binding SubmitCommand}"
+ AutomationId="ServerUrlEntry"/>
+ StyleClass="box-value"
+ AutomationId="WebVaultUrlEntry"/>
+ StyleClass="box-value"
+ AutomationId="ApiUrlEntry"/>
+ StyleClass="box-value"
+ AutomationId="IdentityUrlEntry"/>
+ ReturnCommand="{Binding SubmitCommand}"
+ AutomationId="IconsUrlEntry"/>