diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index f60037cec5..beccef809d 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -48,12 +48,6 @@ class acp_board
 		global $config, $phpbb_root_path, $phpEx;
 		global $cache, $phpbb_container, $phpbb_dispatcher, $phpbb_log;
 
-		if (!$language)
-		{
-			/** @var language $language Language object */
-			$language = $phpbb_container->get('language');
-		}
-
 		$this->config = $config;
 		$this->language = $language;
 		$this->user = $user;
@@ -1071,9 +1065,7 @@ class acp_board
 	*/
 	function timezone_select($value, $key)
 	{
-		global $user;
-
-		$timezone_select = phpbb_timezone_select($user, $value, true);
+		$timezone_select = phpbb_timezone_select($this->user, $value, true);
 
 		return [
 			'tag'			=> 'select',
diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php
index 441f1f5add..26d16aaae8 100644
--- a/phpBB/includes/functions_acp.php
+++ b/phpBB/includes/functions_acp.php
@@ -368,7 +368,7 @@ function phpbb_build_cfg_template(array $tpl_type, string $key, &$new_ary, $conf
 
 		case 'radio':
 			$tpl_type_cond = explode('_', $tpl_type[1]);
-			$type_no = !(($tpl_type_cond[0] == 'disabled' || $tpl_type_cond[0] == 'enabled'));
+			$type_no = $tpl_type_cond[0] != 'disabled' && $tpl_type_cond[0] != 'enabled';
 
 			$no_button = [
 				'type'		=> 'radio',