diff --git a/phpBB/templates/subSilver/subSilver.css b/phpBB/templates/subSilver/subSilver.css
index 39c1ff6e6e..2d1fc60ef8 100644
--- a/phpBB/templates/subSilver/subSilver.css
+++ b/phpBB/templates/subSilver/subSilver.css
@@ -135,7 +135,7 @@ a.postlink:hover { text-decoration: underline; color : #C23030 }
 		  background-color: #FAFAFA; border: #c2cdd6; border-style: solid;
 		  border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px
 		}
-.signature	{ font-size : 11px; text-decoration : none; line-height : 150%; color : #333366; }
+.signature	{ font-size : 11px; text-decoration : none; color : #333366; }
 .editedby	{ font-size : 10px; line-height : 100%; color : #333333; }
 
 
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index d5d9be710c..0aef211ee2 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -942,6 +942,7 @@ for($i = 0; $i < $total_posts; $i++)
 	// important, moving things around could break any 
 	// output
 	//
+	$message = make_clickable($message);
 
 	//
 	// If the board has HTML off but the post has HTML
@@ -966,6 +967,7 @@ for($i = 0; $i < $total_posts; $i++)
 	if( $user_sig != "" && $postrow[$i]['enable_sig'] && $user_sig_bbcode_uid != "" )
 	{
 		$user_sig = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($user_sig, $user_sig_bbcode_uid) : preg_replace("/\:[0-9a-z\:]+\]/si", "]", $user_sig);
+		$user_sig = "<span class=\"signature\">". make_clickable($user_sig). "</span>";
 	}
 
 	//