diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 3ff7716edd..2a3157ffbe 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -5750,7 +5750,7 @@ function phpbb_get_web_root_path(Request $symfony_request, $phpbb_root_path = ''
 	$corrections = substr_count($path_info, '/');
 
 	// We need to account for whether or not app.php is in the URL
-	if (strpos($symfony_request->server->get('REQUEST_URI', ''), 'app.' . $phpEx) !== false)
+	if (strpos($symfony_request->server->get('REQUEST_URI', ''), 'app.' . $phpEx . '/') === false)
 	{
 		$corrections -= 1;
 	}
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 369317e6c9..cde96fe2fd 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -428,8 +428,8 @@ $lang = array_merge($lang, array(
 	'ICONS_PATH'				=> 'Post icons storage path',
 	'ICONS_PATH_EXPLAIN'		=> 'Path under your phpBB root directory, e.g. <samp>images/icons</samp>.',
 	'MOD_REWRITE_ENABLE'		=> 'Enable URL Rewriting',
-	'MOD_REWRITE_ENABLE_EXPLAIN' => 'When disabled, URL paths will include app.php. When enabled, URL paths will not include app.php.<br /><strong>This option requires the Apache module <samp>mod_rewrite</samp> to be enabled and the appropriate rewrite rules must be present in <samp>.htaccess</samp>.</strong>',
-	'MOD_REWRITE_DISABLED'		=> 'The <samp>mod_rewrite</samp> module on your Apache web server is disabled. Enable the module or contact your web hosting provider if you wish to enable this feature.',
+	'MOD_REWRITE_ENABLE_EXPLAIN' => 'When disabled, URL paths will include app.php. When enabled, URL paths will not include app.php.<br /><strong>This option requires the Apache module mod_rewrite to be enabled and the appropriate rewrite rules must be present in .htaccess.</strong>',
+	'MOD_REWRITE_DISABLED'		=> 'The <strong>mod_rewrite</strong> module on your Apache web server is disabled. Enable the module or contact your web hosting provider if you wish to enable this feature.',
 	'MOD_REWRITE_INFORMATION_UNAVAILABLE' => 'We are unable to determine whether or not this server supports URL rewriting. This setting may be enabled but if URL rewriting is not available, paths generated by this board (such as for use in links) may be broken. Contact your web hosting provider if you are unsure whether or not you can safely enable this feature.',
 	'PATH_SETTINGS'				=> 'Path settings',
 	'RANKS_PATH'				=> 'Rank image storage path',