diff --git a/phpBB/profile.php b/phpBB/profile.php
index b609743381..780951ad8a 100644
--- a/phpBB/profile.php
+++ b/phpBB/profile.php
@@ -667,7 +667,11 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
 					$sig_length_check = preg_replace("/(\<.*?)(=.*?)( .*?=.*?)?([ \/]?\>)/is", "\\1\\3\\4", $sig_length_check);
 				}
 
-				$signature_bbcode_uid = ( $allowbbcode ) ? make_bbcode_uid() : "";
+				// Only create a new bbcode_uid when there was no uid yet.
+				if($signature_bbcode_uid == '')
+				{
+					$signature_bbcode_uid = ( $allowbbcode ) ? make_bbcode_uid() : "";
+				}
 				$signature = prepare_message($signature, $allowhtml, $allowbbcode, $allowsmilies, $signature_bbcode_uid);
 
 				if( strlen($sig_length_check) > $board_config['max_sig_chars'] )
@@ -2050,4 +2054,4 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
 	}
 }
 
-?>
\ No newline at end of file
+?>