diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 61c1c963b8..2210b6f8a5 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -25,7 +25,7 @@ if (!defined('IN_PHPBB'))
 */
 
 // phpBB Version
-define('PHPBB_VERSION', '3.0.4-RC1');
+define('PHPBB_VERSION', '3.0.4');
 
 // QA-related
 // define('PHPBB_QA', 1);
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php
index 1228f8e567..f5c0786fed 100644
--- a/phpBB/includes/functions_content.php
+++ b/phpBB/includes/functions_content.php
@@ -1144,7 +1144,7 @@ function truncate_string($string, $max_length = 60, $max_store_length = 255, $al
 
 /**
 * Get username details for placing into templates.
-* This function caches all modes on first call, except for no_profile - determined by $user_id/$guest_username combination.
+* This function caches all modes on first call, except for no_profile and anonymous user - determined by $user_id.
 *
 * @param string $mode Can be profile (for getting an url to the profile), username (for obtaining the username), colour (for obtaining the user colour), full (for obtaining a html string representing a coloured link to the users profile) or no_profile (the same as full but forcing no profile link)
 * @param int $user_id The users id
@@ -1161,10 +1161,10 @@ function get_username_string($mode, $user_id, $username, $username_colour = '',
 	static $_profile_cache;
 	static $_base_profile_url;
 
-	$cache_key = $user_id . (string) $guest_username;
+	$cache_key = $user_id;
 
 	// If the get_username_string() function had been executed once with an (to us) unkown mode, all modes are pre-filled and we can just grab it.
-	if (isset($_profile_cache[$cache_key][$mode]))
+	if ($user_id && $user_id != ANONYMOUS && isset($_profile_cache[$cache_key][$mode]))
 	{
 		// If the mode is 'no_profile', we simply construct the TPL code due to calls to this mode being very very rare
 		if ($mode == 'no_profile')
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index a0627a917f..fb37b62203 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-$updates_to_version = '3.0.4-RC1';
+$updates_to_version = '3.0.4';
 
 // Return if we "just include it" to find out for which version the database update is responsible for
 if (defined('IN_PHPBB') && defined('IN_INSTALL'))
@@ -587,6 +587,9 @@ $database_update_info = array(
 			),
 		),
 	),
+
+	// Changes from 3.0.4-RC1 to 3.0.4
+	'3.0.4-RC1'		=> array(),
 );
 
 // Determine mapping database type
@@ -2028,6 +2031,10 @@ function change_database_data(&$no_updates, $version)
 
 			$no_updates = false;
 		break;
+
+		// Changes from 3.0.4-RC1 to 3.0.4
+		case '3.0.4-RC1':
+		break;
 	}
 }
 
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index f469436e00..1e2669aeb5 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -218,7 +218,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page',
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.4-RC1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.4');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');