diff --git a/files/gitlab-cookbooks/gitlab/attributes/default.rb b/files/gitlab-cookbooks/gitlab/attributes/default.rb
index de258d8..74a996c 100644
--- a/files/gitlab-cookbooks/gitlab/attributes/default.rb
+++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb
@@ -134,7 +134,7 @@ default['gitlab']['gitlab-rails']['smtp_port'] = nil
 default['gitlab']['gitlab-rails']['smtp_user_name'] = nil
 default['gitlab']['gitlab-rails']['smtp_password'] = nil
 default['gitlab']['gitlab-rails']['smtp_domain'] = nil
-default['gitlab']['gitlab-rails']['smtp_authentication'] = "login"
+default['gitlab']['gitlab-rails']['smtp_authentication'] = nil
 default['gitlab']['gitlab-rails']['smtp_enable_starttls_auto'] = nil
 
 ####
diff --git a/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb b/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
index 485dd0b..424ac42 100644
--- a/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
+++ b/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
@@ -101,7 +101,6 @@ end
 
 template_symlink File.join(gitlab_rails_etc_dir, "smtp_settings.rb") do
   link_from File.join(gitlab_rails_source_dir, "config/initializers/smtp_settings.rb")
-  helpers SingleQuoteHelper
   owner "root"
   group "root"
   mode "0644"
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/smtp_settings.rb.erb b/files/gitlab-cookbooks/gitlab/templates/default/smtp_settings.rb.erb
index 43874b0..a407bc2 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/smtp_settings.rb.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/smtp_settings.rb.erb
@@ -6,12 +6,11 @@ if Rails.env.production?
   Gitlab::Application.config.action_mailer.delivery_method = :smtp
 
   ActionMailer::Base.smtp_settings = {
-    address: <%= single_quote(@smtp_address) %>,
-    port: <%= @smtp_port %>,
-    user_name: <%= single_quote(@smtp_user_name) %>,
-    password: <%= single_quote(@smtp_password) %>,
-    domain: <%= single_quote(@smtp_domain) %>,
-    authentication: :<%= @smtp_authentication %>,
-    enable_starttls_auto: <%= @smtp_enable_starttls_auto %>
+    authentication: <%= @smtp_authentication.to_s.to_sym.inspect %>,
+<% %w{ address port user_name password domain enable_starttls_auto }.each do |key| %>
+  <% if value = node['gitlab']['gitlab-rails']["smtp_#{key}"] %>
+    <%= "#{key}: #{value.inspect}," %>
+  <% end %>
+<% end %>
   }
 end
--
libgit2 0.21.2