diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 54cdcb8e32..387b8f1fb9 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -773,12 +773,18 @@ class acp_board
 		global $user, $config;
 
 		$radio_ary = array(USER_ACTIVATION_DISABLE => 'ACC_DISABLE', USER_ACTIVATION_NONE => 'ACC_NONE');
+		$radio_text = h_radio('config[require_activation]', $radio_ary, $value, $key);
 		if ($config['email_enable'])
 		{
-			$radio_ary += array(USER_ACTIVATION_SELF => 'ACC_USER', USER_ACTIVATION_ADMIN => 'ACC_ADMIN');
+			$radio_ary = array(USER_ACTIVATION_SELF => 'ACC_USER', USER_ACTIVATION_ADMIN => 'ACC_ADMIN');
+			// With longer labels the four options no longer fit
+			// onto a single line. Separate them onto two lines.
+			// This also requires two h_radio calls to generate HTML.
+			$radio_text .= '<br /><br />';
+			$radio_text .= h_radio('config[require_activation]', $radio_ary, $value, $key);
 		}
 
-		return h_radio('config[require_activation]', $radio_ary, $value, $key);
+		return $radio_text;
 	}
 
 	/**
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 084076d8dc..655fa4d56c 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -208,16 +208,16 @@ $lang = array_merge($lang, array(
 	'ACP_REGISTER_SETTINGS_EXPLAIN'		=> 'Here you are able to define registration and profile related settings.',
 
 	'ACC_ACTIVATION'				=> 'Account activation',
-	'ACC_ACTIVATION_EXPLAIN'		=> 'This determines whether users have immediate access to the board or if confirmation is required. You can also completely disable new registrations.',
+	'ACC_ACTIVATION_EXPLAIN'		=> 'This determines whether users have immediate access to the board or if confirmation is required. You can also completely disable new registrations. "Board-wide e-mail" must be enabled in order to use user or admin activation.',
 	'NEW_MEMBER_POST_LIMIT'			=> 'New member post limit',
 	'NEW_MEMBER_POST_LIMIT_EXPLAIN'	=> 'New members are within the <em>Newly Registered Users</em> group until they reach this number of posts. You can use this group to keep them from using the PM system or to review their posts. <strong>A value of 0 disables this feature.</strong>',
 	'NEW_MEMBER_GROUP_DEFAULT'		=> 'Set Newly Registered Users group to default',
 	'NEW_MEMBER_GROUP_DEFAULT_EXPLAIN'	=> 'If set to yes, and a new member post limit is specified, newly registered users will not only be put into the <em>Newly Registered Users</em> group, but this group will also be their default one. This may come in handy if you want to assign a group default rank and/or avatar the user then inherits.',
 
-	'ACC_ADMIN'					=> 'By Admin',
-	'ACC_DISABLE'				=> 'Disable',
-	'ACC_NONE'					=> 'None',
-	'ACC_USER'					=> 'By User',
+	'ACC_ADMIN'					=> 'By admin',
+	'ACC_DISABLE'				=> 'Disable registration',
+	'ACC_NONE'					=> 'No activation (immediate access)',
+	'ACC_USER'					=> 'By user (email verification)',
 //	'ACC_USER_ADMIN'			=> 'User + Admin',
 	'ALLOW_EMAIL_REUSE'			=> 'Allow e-mail address re-use',
 	'ALLOW_EMAIL_REUSE_EXPLAIN'	=> 'Different users can register with the same e-mail address.',