diff --git a/Shared/Settings/AccountForm.swift b/Shared/Settings/AccountForm.swift
index 72ab0593..6e3d8ec2 100644
--- a/Shared/Settings/AccountForm.swift
+++ b/Shared/Settings/AccountForm.swift
@@ -81,6 +81,10 @@ struct AccountForm: View {
 
     @ViewBuilder var formFields: some View {
         TextField("Username", text: $username)
+        #if !os(macOS)
+            .autocapitalization(.none)
+        #endif
+            .disableAutocorrection(true)
         SecureField("Password", text: $password)
 
         #if os(tvOS)
diff --git a/Shared/Settings/LocationsSettings.swift b/Shared/Settings/LocationsSettings.swift
index 907d2cff..d2a80517 100644
--- a/Shared/Settings/LocationsSettings.swift
+++ b/Shared/Settings/LocationsSettings.swift
@@ -50,12 +50,13 @@ struct LocationsSettings: View {
     @ViewBuilder var settings: some View {
         Section(header: SettingsHeader(text: "Locations Manifest".localized())) {
             TextField("URL", text: $instancesManifest)
-            Button("Reload manifest", action: loadCountries)
-                .disabled(instancesManifest.isEmpty)
             #if !os(macOS)
-                .keyboardType(.webSearch)
+                .keyboardType(.URL)
+                .autocapitalization(.none)
             #endif
                 .disableAutocorrection(true)
+            Button("Reload manifest", action: loadCountries)
+                .disabled(instancesManifest.isEmpty)
         }
         .padding(.bottom, 4)