diff --git a/src/Umbraco.Core/Configuration/GlobalSettings.cs b/src/Umbraco.Core/Configuration/GlobalSettings.cs
index 7b209a15cd..11e6b2595f 100644
--- a/src/Umbraco.Core/Configuration/GlobalSettings.cs
+++ b/src/Umbraco.Core/Configuration/GlobalSettings.cs
@@ -70,7 +70,8 @@ namespace Umbraco.Core.Configuration
 
             var config = WebConfigurationManager.OpenWebConfiguration(appPath);
             var settings = (MailSettingsSectionGroup)config.GetSectionGroup("system.net/mailSettings");
-            if (settings == null || settings.Smtp == null) return false;
+            // note: "noreply@example.com" is/was the sample SMTP from email - we'll regard that as "not configured"
+            if (settings == null || settings.Smtp == null || "noreply@example.com".Equals(settings.Smtp.From, StringComparison.OrdinalIgnoreCase)) return false;
             if (settings.Smtp.SpecifiedPickupDirectory != null && string.IsNullOrEmpty(settings.Smtp.SpecifiedPickupDirectory.PickupDirectoryLocation) == false)
                 return true;
             if (settings.Smtp.Network != null && string.IsNullOrEmpty(settings.Smtp.Network.Host) == false)
diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index 10794e6aa2..84b398f7e2 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -80,9 +80,14 @@
 
     <system.net>
         <mailSettings>
+            <!--
+            If you need Umbraco to send out system mails (like reset password and invite user),
+            you must configure your SMTP host here - for example:
+
             <smtp from="noreply@example.com">
                 <network host="127.0.0.1" userName="username" password="password" />
             </smtp>
+            -->
         </mailSettings>
     </system.net>