diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 65542f8078..19a97a5298 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -50,8 +50,8 @@ $lang = array_merge($lang, array(
 	'DEFAULT_STYLE_EXPLAIN'			=> 'The default style for new users.',
 	'DISABLE_BOARD'					=> 'Disable board',
 	'DISABLE_BOARD_EXPLAIN'			=> 'This will make the board unavailable to users who are neither administrators nor moderators. You can also enter a short (255 character) message to display if you wish.',
-	'DISABLE_BOARD_ACCESS'			=> 'Limit access of disabled board',
-	'DISABLE_BOARD_ACCESS_EXPLAIN'	=> 'This setting limits the access to a disable board to only administrators, or administrators plus global moderators or administrators and all moderators',
+	'DISABLE_BOARD_ACCESS'			=> 'Limit access to disabled board',
+	'DISABLE_BOARD_ACCESS_EXPLAIN'	=> 'This setting limits the access to a disabled board to only administrators, or administrators plus global moderators or administrators and all moderators.',
 	'DISABLE_BOARD_ACCESS_ADMIN'			=> 'Only administrators',
 	'DISABLE_BOARD_ACCESS_ADMIN_GLOB_MODS'	=> 'Only administrators and global moderators',
 	'DISABLE_BOARD_ACCESS_ADMIN_ALL_MODS'	=> 'Only administrators and all moderators',
diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php
index e5156d8406..2c7e5da8bc 100644
--- a/phpBB/phpbb/user.php
+++ b/phpBB/phpbb/user.php
@@ -373,18 +373,18 @@ class user extends \phpbb\session
 
 		// Is board disabled and user not an admin or moderator?
 		// Check acp setting who has access: only admins "case: 0", plus global moderators "case: 1" and plus moderators "case: 2"
-		$disable_board_access = (int) $config['add_disable_board_access_config'];
+		$board_disable_access = (int) $config['board_disable_access'];
 
-		switch ($disable_board_access) {
+		switch ($board_disable_access) {
 			case 0:
 				$access_disabled_board = $auth->acl_gets('a_');
 				break;
 			case 1:
-				$access_disabled_board = $auth->acl_gets('a_') && $auth->acl_getf_global('m_');
+				$access_disabled_board = $auth->acl_gets('a_') || $auth->acl_getf_global('m_');
 				break;
 			default:
 			case 2:
-				$access_disabled_board = $auth->acl_gets('a_', 'm_') && $auth->acl_getf_global('m_');
+				$access_disabled_board = $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_');
 				break;
 		}