diff --git a/doc/configuration.rst b/doc/configuration.rst
index 6ec0b37..eec82c7 100644
--- a/doc/configuration.rst
+++ b/doc/configuration.rst
@@ -358,14 +358,15 @@ Defaults to: ``25``
 SMTP_SSL
 ~~~~~~~~
 
-This configuration key to define using SMTP connections secured by SSL
+This configuration key allows to specify whether the SMTP connections
+should secured over SSL
 
 Defaults to: ``False``
 
 SMTP_USERNAME
 ~~~~~~~~~~~~~
 
-This configuration key allow to use SMTP authentication
+This configuration key allows usage of SMTP with auth
 
 Note: Specify SMTP_USERNAME and SMTP_PASSWORD for using SMTP auth
 
@@ -374,7 +375,7 @@ Defaults to: ``None``
 SMTP_PASSWORD
 ~~~~~~~~~~~~~
 
-This configuration key allow to use SMTP authentication
+This configuration key allows usage of SMTP with auth
 
 Note: Specify SMTP_USERNAME and SMTP_PASSWORD for using SMTP auth
 
diff --git a/files/pagure.cfg.sample b/files/pagure.cfg.sample
index 7b4efd6..a160c98 100644
--- a/files/pagure.cfg.sample
+++ b/files/pagure.cfg.sample
@@ -25,11 +25,12 @@ PAGURE_ADMIN_USERS = []
 ### The email address to which the flask.log will send the errors (tracebacks)
 EMAIL_ERROR = 'pingou@pingoured.fr'
 
-### Default SMTP server to use for sending emails
+### SMTP settings
 SMTP_SERVER = 'localhost'
 SMTP_PORT = 25
 SMTP_SSL = False
-# Specify SMTP_USERNAME and SMTP_PASSWORD for enabling SMTP auth
+
+#Specify both for enabling SMTP with auth
 SMTP_USERNAME = None
 SMTP_PASSWORD = None
 
diff --git a/pagure/default_config.py b/pagure/default_config.py
index fb1dc77..2489695 100644
--- a/pagure/default_config.py
+++ b/pagure/default_config.py
@@ -151,14 +151,16 @@ GL_RC = None
 GL_BINDIR = None
 
 
-# Default SMTP server to use for sending emails
+#SMTP settings
 SMTP_SERVER = 'localhost'
 SMTP_PORT = 25
 SMTP_SSL = False
-# Specify SMTP_USERNAME and SMTP_PASSWORD for enabling SMTP auth
+
+# Specify both for enabling SMTP auth
 SMTP_USERNAME = None
 SMTP_PASSWORD = None
 
+
 # Email used to sent emails
 FROM_EMAIL = 'pagure@pagure.org'