diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp
index b7de7b588e..c56117148d 100644
--- a/modules/gerrit/manifests/init.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -104,6 +104,9 @@ class gerrit(
   $ldap_password = '',
   $ldap_account_pattern = '',
   $ldap_account_email_address = '',
+  $ldap_sslverify = true,
+  $ldap_ssh_account_name = '',
+  $ldap_accountfullname = '',
   $email = '',
   $smtpserver = 'localhost',
   $sendemail_from = 'MIXED',
diff --git a/modules/gerrit/templates/gerrit.config.erb b/modules/gerrit/templates/gerrit.config.erb
index a4d6efd650..01f128ba32 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -26,10 +26,13 @@
 [ldap]
 	server = <%= ldap_server %>
 	accountBase = <%= ldap_account_base %>
-	username = <%= ldap_username %>
-	password = <%= ldap_password %>
+	<% if ldap_username -%>username = <%= ldap_username %><%end%>
+	<% if ldap_password -%>password = <%= ldap_password %><%end%>
+	<% if ldap_accountfullname -%>accountFullName = <%= ldap_accountfullname %><%end%>
 	accountPattern = <%= ldap_account_pattern %>
 	accountEmailAddress = <%= ldap_account_email_address %>
+	sslVerify = <%= ldap_sslverify %>
+	<% if @ldap_ssh_account_name -%>accountSshUserName = <%= ldap_ssh_account_name %><%end%>
 <% end %>
 [sendemail]
 	smtpServer = <%= smtpserver %>