diff --git a/src/Core/Pages/Accounts/EnvironmentPage.xaml b/src/Core/Pages/Accounts/EnvironmentPage.xaml
index 28bfcaece..855c345a8 100644
--- a/src/Core/Pages/Accounts/EnvironmentPage.xaml
+++ b/src/Core/Pages/Accounts/EnvironmentPage.xaml
@@ -37,7 +37,7 @@
Text="{Binding BaseUrl}"
Keyboard="Url"
Placeholder="ex. https://bitwarden.company.com"
- StyleClass="box-value"
+ StyleClass="box-value, no-keyboard-auto-help"
ReturnType="Go"
ReturnCommand="{Binding SubmitCommand}"
AutomationId="ServerUrlEntry"/>
@@ -59,7 +59,7 @@
x:Name="_webVaultEntry"
Text="{Binding WebVaultUrl}"
Keyboard="Url"
- StyleClass="box-value"
+ StyleClass="box-value, no-keyboard-auto-help"
AutomationId="WebVaultUrlEntry"/>
@@ -70,7 +70,7 @@
x:Name="_apiEntry"
Text="{Binding ApiUrl}"
Keyboard="Url"
- StyleClass="box-value"
+ StyleClass="box-value, no-keyboard-auto-help"
AutomationId="ApiUrlEntry"/>
@@ -81,7 +81,7 @@
x:Name="_identityEntry"
Text="{Binding IdentityUrl}"
Keyboard="Url"
- StyleClass="box-value"
+ StyleClass="box-value, no-keyboard-auto-help"
AutomationId="IdentityUrlEntry"/>
@@ -92,7 +92,7 @@
x:Name="_iconsEntry"
Text="{Binding IconsUrl}"
Keyboard="Url"
- StyleClass="box-value"
+ StyleClass="box-value, no-keyboard-auto-help"
ReturnType="Go"
ReturnCommand="{Binding SubmitCommand}"
AutomationId="IconsUrlEntry"/>
diff --git a/src/Core/Pages/Accounts/HomePage.xaml b/src/Core/Pages/Accounts/HomePage.xaml
index fe6992155..950f7d75c 100644
--- a/src/Core/Pages/Accounts/HomePage.xaml
+++ b/src/Core/Pages/Accounts/HomePage.xaml
@@ -50,11 +50,10 @@
x:Name="_email"
Text="{Binding Email}"
Keyboard="Email"
- StyleClass="box-value"
+ StyleClass="box-value, no-keyboard-auto-help"
ReturnType="Go"
ReturnCommand="{Binding ContinueCommand}"
- AutomationId="EmailAddressEntry"
- >
+ AutomationId="EmailAddressEntry">
diff --git a/src/Core/Resources/Styles/Base.xaml b/src/Core/Resources/Styles/Base.xaml
index 34302c4d9..1eaed8e11 100644
--- a/src/Core/Resources/Styles/Base.xaml
+++ b/src/Core/Resources/Styles/Base.xaml
@@ -557,6 +557,12 @@
+