diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index acad0f37b5..2fe4db7d26 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -218,7 +218,7 @@
     ;; The SMTP server enabled the email module to send email to external
     ;; destinations.
 
-    ;# {enabled} {[Startup]emailmodule:DefaultEmailModule} {Enable SMTP service?} {true false} true
+    ;# {enabled} {[Startup]emailmodule:DefaultEmailModule} {Enable SMTP service?} {true false} false
     ;; Enable sending email via SMTP
     ; enabled = false
 
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index d1b3ae6bd9..bf3622828b 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -277,15 +277,15 @@
 
 
 [SMTP]
-    enabled=false
+    enabled = false
 
-    ;enabled=true
-    ;internal_object_host=lsl.opensim.local
-    ;host_domain_header_from=127.0.0.1
-    ;SMTP_SERVER_HOSTNAME=127.0.0.1
-    ;SMTP_SERVER_PORT=25
-    ;SMTP_SERVER_LOGIN=foo
-    ;SMTP_SERVER_PASSWORD=bar
+    ;enabled = true
+    ;internal_object_host = lsl.opensim.local
+    ;host_domain_header_from = 127.0.0.1
+    ;SMTP_SERVER_HOSTNAME = 127.0.0.1
+    ;SMTP_SERVER_PORT = 25
+    ;SMTP_SERVER_LOGIN = foo
+    ;SMTP_SERVER_PASSWORD = bar
 
 
 [Network]