diff --git a/phpBB/adm/style/acp_board.html b/phpBB/adm/style/acp_board.html
index 6b8ceb3ef6..df7f5e537b 100644
--- a/phpBB/adm/style/acp_board.html
+++ b/phpBB/adm/style/acp_board.html
@@ -34,7 +34,7 @@
 
 <!-- IF S_AUTH -->
 	<!-- BEGIN auth_tpl -->
-		{auth_tpl.TPL}
+		<!-- INCLUDE {auth_tpl.TPL} -->
 	<!-- END auth_tpl -->
 <!-- ENDIF -->
 
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index f142801b72..4c5f951bdc 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -655,15 +655,13 @@ class acp_board
 
 			foreach ($auth_providers as $provider)
 			{
-				$fields = $provider->acp($this->new_config);
-
-				if ($fields['tpl'])
+				$auth_tpl = $provider->get_acp_template($this->new_config);
+				if ($auth_tpl)
 				{
 					$template->assign_block_vars('auth_tpl', array(
-						'TPL'	=> $fields['tpl'],
+						'TPL'	=> $provider->get_acp_template($this->new_config),
 					));
 				}
-				unset($fields);
 			}
 		}
 	}
diff --git a/phpBB/includes/auth/provider/ldap.php b/phpBB/includes/auth/provider/ldap.php
index b063f6d682..0164a60f2e 100644
--- a/phpBB/includes/auth/provider/ldap.php
+++ b/phpBB/includes/auth/provider/ldap.php
@@ -37,6 +37,7 @@ class phpbb_auth_provider_ldap extends phpbb_auth_provider_base
 		$this->db = $db;
 		$this->config = $config;
 		$this->user = $user;
+		$this->template = $template;
 	}
 
 	/**