diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0f35a3d4..e51465b4b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+14.05.2015
+
+* Changed and added some new smtp enviroment variables. More info at application-example.yml
+
 12.05.2015
 
 * Ruby version updated to 2.2.2
diff --git a/config/application-example.yml b/config/application-example.yml
index ad4941eb2..b7ce232ac 100644
--- a/config/application-example.yml
+++ b/config/application-example.yml
@@ -37,11 +37,13 @@ epp_hostname: 'registry.gitlab.eu'
 repp_url: 'https://repp.gitlab.eu/repp/v1/'
 
 # SMTP configuration
-address: 'server-hostname'
-port: '000'
-user_name: 'login'
-password: 'pw/key'
-domain: 'domain for HELO checking'
+smtp_address: 'server-hostname'
+smtp_port: '000'
+smtp_user_name: 'login'
+smtp_password: 'pw/key'
+smtp_domain: 'domain for HELO checking'
+# Use "none" only when for a self-signed and/or wildcard certificate
+smtp_openssl_verify_mode: 'peer' # 'none', 'peer', 'client_once','fail_if_no_peer_cert'
 
 # autotest config overwrites
 test:
diff --git a/config/application.rb b/config/application.rb
index 58ab0c753..f03614d96 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -59,13 +59,14 @@ module Registry
     config.action_mailer.raise_delivery_errors = true
 
     config.action_mailer.smtp_settings = {
-      address: ENV['address'],
-      port: ENV['port'],
+      address: ENV['smtp_address'],
+      port: ENV['smtp_port'],
       enable_starttls_auto: true,
-      user_name: ENV['user_name'],
-      password: ENV['password'],
-      authentication: 'login',
-      domain: ENV['domain']
+      user_name: ENV['smtp_user_name'],
+      password: ENV['smtp_password'],
+      authentication: 'smtp_login',
+      domain: ENV['smtp_domain']
+      openssl_verify_mode: ENV['smtp_openssl_verify_mode']
     }
   end
 end