diff --git a/app/scenes/Settings/Notifications.js b/app/scenes/Settings/Notifications.js
index 8b63e7435..7266ba13e 100644
--- a/app/scenes/Settings/Notifications.js
+++ b/app/scenes/Settings/Notifications.js
@@ -107,7 +107,7 @@ function Notifications() {
         </Trans>
       </HelpText>
 
-      {env.NOTIFICATIONS_ENABLED ? (
+      {env.EMAIL_ENABLED ? (
         <>
           <Input
             type="email"
diff --git a/app/scenes/Settings/Security.js b/app/scenes/Settings/Security.js
index 9e671badc..fbc96084b 100644
--- a/app/scenes/Settings/Security.js
+++ b/app/scenes/Settings/Security.js
@@ -9,6 +9,7 @@ import Checkbox from "components/Checkbox";
 import Heading from "components/Heading";
 import HelpText from "components/HelpText";
 import Scene from "components/Scene";
+import env from "env";
 import useCurrentTeam from "hooks/useCurrentTeam";
 import useStores from "hooks/useStores";
 import useToasts from "hooks/useToasts";
@@ -60,7 +61,12 @@ function Security() {
         name="guestSignin"
         checked={data.guestSignin}
         onChange={handleChange}
-        note={t("When enabled, users can sign-in using their email address")}
+        note={
+          env.EMAIL_ENABLED
+            ? t("When enabled, users can sign-in using their email address")
+            : t("The server must have SMTP configured to enable this setting")
+        }
+        disabled={!env.EMAIL_ENABLED}
       />
       <Checkbox
         label={t("Public document sharing")}
diff --git a/server/presenters/env.js b/server/presenters/env.js
index 30be71074..5b33c5d2c 100644
--- a/server/presenters/env.js
+++ b/server/presenters/env.js
@@ -17,7 +17,7 @@ export default function present(env: Object): Object {
     SLACK_APP_ID: env.SLACK_APP_ID,
     MAXIMUM_IMPORT_SIZE: env.MAXIMUM_IMPORT_SIZE || 1024 * 1000 * 5,
     SUBDOMAINS_ENABLED: env.SUBDOMAINS_ENABLED === "true",
-    NOTIFICATIONS_ENABLED:
+    EMAIL_ENABLED:
       !!env.SMTP_USERNAME || env.NODE_ENV === "development",
     GOOGLE_ANALYTICS_ID: env.GOOGLE_ANALYTICS_ID,
     RELEASE: env.SOURCE_COMMIT || env.SOURCE_VERSION || undefined,
diff --git a/shared/i18n/locales/en_US/translation.json b/shared/i18n/locales/en_US/translation.json
index 2cd2fe439..b33fedec1 100644
--- a/shared/i18n/locales/en_US/translation.json
+++ b/shared/i18n/locales/en_US/translation.json
@@ -549,7 +549,7 @@
   "Unsubscription successful. Your notification settings were updated": "Unsubscription successful. Your notification settings were updated",
   "Manage when and where you receive email notifications from Outline. Your email address can be updated in your SSO provider.": "Manage when and where you receive email notifications from Outline. Your email address can be updated in your SSO provider.",
   "Email address": "Email address",
-  "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable the integration.": "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable the integration.",
+  "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable notifications.": "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable notifications.",
   "Everyone that has signed into Outline appears here. It’s possible that there are other users who have access through {team.signinMethods} but haven’t signed in yet.": "Everyone that has signed into Outline appears here. It’s possible that there are other users who have access through {team.signinMethods} but haven’t signed in yet.",
   "Filter": "Filter",
   "Profile saved": "Profile saved",