diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 2dc40bfdc3..d4052a8968 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -956,11 +956,9 @@ class smtp_class
 
 	function smtp_class()
 	{
-		if (defined('DEBUG'))
-		{
-			$this->backtrace = true;
-			$this->backtrace_log = array();
-		}
+		// Always create a backtrace for admins to identify SMTP problems
+		$this->backtrace = true;
+		$this->backtrace_log = array();
 	}
 
 	/**
@@ -970,7 +968,7 @@ class smtp_class
 	{
 		if ($this->backtrace)
 		{
-			$this->backtrace_log[] = htmlspecialchars($message, ENT_COMPAT, 'UTF-8');
+			$this->backtrace_log[] = utf8_htmlspecialchars($message);
 		}
 	}
 
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 9635036dee..5eecbeea33 100755
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -908,7 +908,7 @@ class install_install extends module
 		$config_data .= "\$acm_type = 'file';\n";
 		$config_data .= "\$load_extensions = '$load_extensions';\n\n";
 		$config_data .= "@define('PHPBB_INSTALLED', true);\n";
-		$config_data .= "@define('DEBUG', true);\n"; // @todo Comment out when final
+		$config_data .= "// @define('DEBUG', true);\n";
 		$config_data .= "// @define('DEBUG_EXTRA', true);\n";
 		$config_data .= '?' . '>'; // Done this to prevent highlighting editors getting confused!