diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 39068ccbb8..2f73a5c27b 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1193,7 +1193,14 @@ function redirect($url)
 		// Is the uri pointing to the current directory?
 		if ($pathinfo['dirname'] == '.')
 		{
-			$url = generate_board_url() . '/' . $user->page['page_dir'] . '/' . str_replace('./', '', $url);
+			if ($user->page['page_dir'])
+			{
+				$url = generate_board_url() . '/' . $user->page['page_dir'] . '/' . str_replace('./', '', $url);
+			}
+			else
+			{
+				$url = generate_board_url() . '/' . str_replace('./', '', $url);
+			}
 		}
 		else
 		{