2 files changed, 13 insertions, 0 deletions

diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index 9a200d734..77548bdcf 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -219,6 +219,11 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
           options: spellcheckerLanguage,
           disabled: !stores.settings.app.enableSpellchecking,
         },
+        userAgentPref: {
+          label: intl.formatMessage(globalMessages.userAgentPref),
+          placeholder: service.defaultUserAgent,
+          value: service.userAgentPref ? service.userAgentPref : '',
+        },
       },
     };
 
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index a5dc427ba..2b2d7277b 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -18,6 +18,7 @@ import { config as spellcheckerConfig } from '../../features/spellchecker';
 
 import { getSelectOptions } from '../../helpers/i18n-helpers';
 import { hash } from '../../helpers/password-helpers';
+import defaultUserAgent from '../../helpers/userAgent-helpers';
 
 import EditSettingsForm from '../../components/settings/settings/EditSettingsForm';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
@@ -283,6 +284,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
         showDragArea: settingsData.showDragArea,
         enableSpellchecking: settingsData.enableSpellchecking,
         spellcheckerLanguage: settingsData.spellcheckerLanguage,
+        userAgentPref: settingsData.userAgentPref,
         beta: settingsData.beta, // we need this info in the main process as well
         automaticUpdates: settingsData.automaticUpdates, // we need this info in the main process as well
         locale: settingsData.locale, // we need this info in the main process as well
@@ -524,6 +526,12 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           options: spellcheckingLanguages,
           default: DEFAULT_APP_SETTINGS.spellcheckerLanguage,
         },
+        userAgentPref: {
+          label: intl.formatMessage(globalMessages.userAgentPref),
+          value: settings.all.app.userAgentPref,
+          default: DEFAULT_APP_SETTINGS.userAgentPref,
+          placeholder: defaultUserAgent(),
+        },
         darkMode: {
           label: intl.formatMessage(messages.darkMode),
           value: settings.all.app.darkMode,