diff --git a/frontend/src/FirstRun/AuthenticationRequiredModalContent.js b/frontend/src/FirstRun/AuthenticationRequiredModalContent.js
index 5b9141a7b..e277845c3 100644
--- a/frontend/src/FirstRun/AuthenticationRequiredModalContent.js
+++ b/frontend/src/FirstRun/AuthenticationRequiredModalContent.js
@@ -63,20 +63,22 @@ function AuthenticationRequiredModalContent(props) {
           className={styles.authRequiredAlert}
           kind={kinds.WARNING}
         >
-          {translate('AuthenticationRequiredWarning')}
+          {translate('AuthenticationRequiredWarning', { appName: 'Sonarr' })}
         </Alert>
 
         {
           isPopulated && !error ?
             <div>
               <FormGroup>
-                <FormLabel>{translate('Authentication')}</FormLabel>
+                <FormLabel>{translate('AuthenticationMethod')}</FormLabel>
 
                 <FormInputGroup
                   type={inputTypes.SELECT}
                   name="authenticationMethod"
                   values={authenticationMethodOptions}
-                  helpText={translate('AuthenticationMethodHelpText')}
+                  helpText={translate('AuthenticationMethodHelpText', { appName: 'Sonarr' })}
+                  helpTextWarning={authenticationMethod.value === 'none' ? translate('AuthenticationMethodHelpTextWarning') : undefined}
+                  helpLink="https://wiki.servarr.com/sonarr/faq#forced-authentication"
                   onChange={onInputChange}
                   {...authenticationMethod}
                 />
@@ -102,6 +104,7 @@ function AuthenticationRequiredModalContent(props) {
                   type={inputTypes.TEXT}
                   name="username"
                   onChange={onInputChange}
+                  helpTextWarning={username.value === '' ? translate('AuthenticationRequiredUsernameHelpTextWarning') : undefined}
                   {...username}
                 />
               </FormGroup>
@@ -113,6 +116,7 @@ function AuthenticationRequiredModalContent(props) {
                   type={inputTypes.PASSWORD}
                   name="password"
                   onChange={onInputChange}
+                  helpTextWarning={password.value === '' ? translate('AuthenticationRequiredPasswordHelpTextWarning') : undefined}
                   {...password}
                 />
               </FormGroup>
diff --git a/frontend/src/Settings/General/SecuritySettings.js b/frontend/src/Settings/General/SecuritySettings.js
index a743e953b..011b308d0 100644
--- a/frontend/src/Settings/General/SecuritySettings.js
+++ b/frontend/src/Settings/General/SecuritySettings.js
@@ -139,8 +139,8 @@ class SecuritySettings extends Component {
             type={inputTypes.SELECT}
             name="authenticationMethod"
             values={authenticationMethodOptions}
-            helpText={translate('AuthenticationMethodHelpText')}
-            helpTextWarning={translate('AuthenticationRequiredWarning')}
+            helpText={translate('AuthenticationMethodHelpText', { appName: 'Sonarr' })}
+            helpTextWarning={translate('AuthenticationRequiredWarning', { appName: 'Sonarr' })}
             onChange={onInputChange}
             {...authenticationMethod}
           />
diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json
index 8a8c1e65f..2a30c996f 100644
--- a/src/NzbDrone.Core/Localization/Core/en.json
+++ b/src/NzbDrone.Core/Localization/Core/en.json
@@ -103,10 +103,14 @@
   "AuthBasic": "Basic (Browser Popup)",
   "AuthForm": "Forms (Login Page)",
   "Authentication": "Authentication",
-  "AuthenticationMethodHelpText": "Require Username and Password to access Sonarr",
+  "AuthenticationMethod": "Authentication Method",
+  "AuthenticationMethodHelpText": "Require Username and Password to access {appName}",
+  "AuthenticationMethodHelpTextWarning": "Please select a valid authentication method",
   "AuthenticationRequired": "Authentication Required",
   "AuthenticationRequiredHelpText": "Change which requests authentication is required for. Do not change unless you understand the risks.",
-  "AuthenticationRequiredWarning": "To prevent remote access without authentication, Sonarr now requires authentication to be enabled. You can optionally disable authentication from local addresses.",
+  "AuthenticationRequiredPasswordHelpTextWarning": "Enter a new password",
+  "AuthenticationRequiredUsernameHelpTextWarning": "Enter a new username",
+  "AuthenticationRequiredWarning": "To prevent remote access without authentication, {appName} now requires authentication to be enabled. You can optionally disable authentication from local addresses.",
   "AutoAdd": "Auto Add",
   "AutoRedownloadFailedHelpText": "Automatically search for and attempt to download a different release",
   "AutoTagging": "Auto Tagging",