diff --git a/upload/config.php b/upload/config.php
index f6134fb8f..c71da5c44 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -53,8 +53,8 @@ $bb_cfg = $tr_cfg = $page_cfg = array();
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.2 Beta';
-$bb_cfg['tp_release_state'] = 'R302';
-$bb_cfg['tp_release_date'] = '30-10-2011';
+$bb_cfg['tp_release_state'] = 'R303';
+$bb_cfg['tp_release_date'] = '03-11-2011';
 
 // Database
 $charset  = 'utf8';
diff --git a/upload/templates/default/viewtopic.tpl b/upload/templates/default/viewtopic.tpl
index e2aca1334..3003eca9b 100644
--- a/upload/templates/default/viewtopic.tpl
+++ b/upload/templates/default/viewtopic.tpl
@@ -38,7 +38,8 @@ function edit_post(post_id, type, text) {
 		ajax.open_edit = false;
 	}
 }
-ajax.callback.posts = function(data) {
	if(data.html){
+ajax.callback.posts = function(data) {
+	if(data.html){
 		$('#pp_'+ data.post_id).show().html(data.html);
 		initPostBBCode('#pp_'+ data.post_id);
 	    $('#pe_'+ data.post_id).hide();
@@ -48,7 +49,8 @@ ajax.callback.posts = function(data) {
	if(data.html){
 		$('#pe_'+ data.post_id).html(data.text);
 	}
 	if(data.redirect) document.location.href = data.redirect;
-	if(data.hide) {
		if(ajax.open_edit == data.post_id) ajax.open_edit = false;
+	if(data.hide) {
+		if(ajax.open_edit == data.post_id) ajax.open_edit = false;
 		$('tbody#post_'+ data.post_id).hide();
 	}
 	if(data.quote) $('textarea#message').attr('value', $('textarea#message').val() + data.message +' ').focus();
@@ -220,11 +222,11 @@ function set_hid_chbox (id)
 		<p class="avatar">{postrow.POSTER_AVATAR}</p>
 	<!-- ELSE -->
 		<!-- IF QUICK_REPLY -->
-		<p class="nick<!-- IF postrow.POSTER_NAME --> nick-author<!-- ENDIF -->" title="{L_INS_NAME_TIP}" onmouseout="bbcode.refreshSelection(false);" onmouseover="bbcode.refreshSelection(true);" onclick="bbcode.onclickPoster('{postrow.POSTER_NAME_JS}');">
+		<p class="nick<!-- IF postrow.POSTER_AUTHOR --> nick-author<!-- ENDIF -->" title="{L_INS_NAME_TIP}" onmouseout="bbcode.refreshSelection(false);" onmouseover="bbcode.refreshSelection(true);" onclick="bbcode.onclickPoster('{postrow.POSTER_NAME_JS}');">
 			<a href="#" onclick="return false;">{postrow.POSTER_NAME}</a>
 		</p>
 		<!-- ELSE -->
-		<p class="nick<!-- IF postrow.POSTER_NAME --> nick-author<!-- ENDIF -->">{postrow.POSTER_NAME}</p>
+		<p class="nick<!-- IF postrow.POSTER_AUTHOR --> nick-author<!-- ENDIF -->">{postrow.POSTER_NAME}</p>
 		<!-- ENDIF -->
 
 		<!-- IF postrow.POSTER_RANK --><p class="rank_txt">{postrow.POSTER_RANK}</p><!-- ENDIF -->
diff --git a/upload/viewtopic.php b/upload/viewtopic.php
index 63306e2e7..b8d4da88a 100644
--- a/upload/viewtopic.php
+++ b/upload/viewtopic.php
@@ -860,7 +860,9 @@ for($i = 0; $i < $total_posts; $i++)
 	$user_sig = ($bb_cfg['allow_sig'] && !$user->opt_js['h_sig'] && $postrow[$i]['user_sig']) ? $postrow[$i]['user_sig'] : '';
 
 	if(bf($postrow[$i]['user_opt'], 'user_opt', 'allow_sig'))
-	{
		$user_sig = $lang['SIGNATURE_DISABLE'];
	}
+	{
+		$user_sig = $lang['SIGNATURE_DISABLE'];
+	}
 	else if ($user_sig)
 	{
 		$user_sig = bbcode2html($user_sig);
@@ -947,7 +949,7 @@ for($i = 0; $i < $total_posts; $i++)
 		'ROW_CLASS'          => !($i % 2) ? 'row1' : 'row2',
 		'POST_ID'            => $postrow[$i]['post_id'],
 		'IS_NEWEST'          => ($postrow[$i]['post_id'] == $newest),
-		'POSTER_NAME'        => ($poster_id != $t_data['topic_poster']) ? profile_url(array('username' => $poster, 'user_rank' => $user_rank)) : $poster,
+		'POSTER_NAME'        => ($poster_id != $t_data['topic_poster']) ? profile_url(array('username' => $poster, 'user_rank' => $user_rank)) : wbr($poster),
 		'POSTER_NAME_JS'     => addslashes($poster),
 		'POSTER_RANK'        => $poster_rank,
 		'RANK_IMAGE'         => $rank_image,
@@ -958,6 +960,7 @@ for($i = 0; $i < $total_posts; $i++)
 		'POSTER_FROM'        => ($bb_cfg['show_poster_from']) ? wbr($poster_from) : '',
 		'POSTER_BOT'         => ($poster_id == BOT_UID),
 		'POSTER_ID'          => $poster_id,
+		'POSTER_AUTHOR'      => ($poster_id == $t_data['topic_poster']),
 		'POSTED_AFTER'       => ($prev_post_time) ? delta_time($postrow[$i]['post_time'], $prev_post_time) : '',
 		'IS_UNREAD'          => is_unread($postrow[$i]['post_time'], $topic_id, $forum_id),
 		'IS_FIRST_POST'      => (!$start && ($postrow[$i]['post_id'] == $t_data['topic_first_post_id'])),
@@ -1034,7 +1037,9 @@ if ($bb_cfg['show_quick_reply'])
 }
 
 foreach($is_auth as $name => $is)
-{
	$template->assign_vars(array(strtoupper($name) => $is));
}
+{
+	$template->assign_vars(array(strtoupper($name) => $is));
+}
 
 $template->assign_vars(array(
 	'PG_ROW_CLASS' => isset($pg_row_class) ? $pg_row_class : 'row1',