diff --git a/phpBB/posting.php b/phpBB/posting.php
index 5418ff7a5d..0a2ff94985 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -607,11 +607,11 @@ if( $refresh || isset($HTTP_POST_VARS['del_poll_option']) || $error_msg != '' )
 
 	if ( $mode == 'newtopic' || $mode == 'reply')
 	{
-		$user_sig = ( $userdata['user_sig'] != '' ) ? $userdata['user_sig'] : '';
+		$user_sig = ( $userdata['user_sig'] != '' && $board_config['allow_sig'] ) ? $userdata['user_sig'] : '';
 	}
 	else if ( $mode == 'editpost' )
 	{
-		$user_sig = ( $post_info['user_sig'] != '' ) ? $post_info['user_sig'] : '';
+		$user_sig = ( $post_info['user_sig'] != '' && $board_config['allow_sig'] ) ? $post_info['user_sig'] : '';
 	}
 	
 	if( $preview )
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 42ea9ae44c..86a8e0a554 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1046,7 +1046,7 @@ for($i = 0; $i < $total_posts; $i++)
 		}
 	}
 
-	if ( $user_sig != '' && $board_config['allow_sig'] )
+	if ( $user_sig != '' )
 	{
 		$user_sig = make_clickable($user_sig);
 	}