diff --git a/public/src/forum/footer.js b/public/src/forum/footer.js
index a479ae06e5..6a1e4204ad 100644
--- a/public/src/forum/footer.js
+++ b/public/src/forum/footer.js
@@ -35,12 +35,26 @@
 	socket.on('api:updateHeader', function(data) {
 		var rightMenu = $('#right-menu');
 		if (data.uid > 0) {
+
 			var userLabel = rightMenu.find('#user_label');
-			userLabel.attr('href','/users/'+data['username']);
-			
-			userLabel.find('img').attr('src',data['picture']+"?s=24&default=identicon");
-			userLabel.find('span').html(data['username']);
+			if(userLabel.length) {
+				userLabel.attr('href','/users/'+data['username']);
 			
+				userLabel.find('img').attr('src',data['picture']+"?s=24&default=identicon");
+				userLabel.find('span').html(data['username']);
+			}
+			else {
+				var userli = $('<li> \
+									<a id="user_label" href="/users/'+data['username']+'"> \
+										<img src="'+data['picture']+"?s=24&default=identicon"+'"/> \
+										<span>'+data['username']+'</span> \
+									</a> \
+								</li>');
+				rightMenu.append(userli);
+
+				var logoutli = $('<li><a href="/logout">Log out</a></li>');
+				rightMenu.append(logoutli);
+			}
 		} else {
 			rightMenu.html('');
 
diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js
index c5453595a6..ee51215675 100644
--- a/public/src/forum/topic.js
+++ b/public/src/forum/topic.js
@@ -445,12 +445,12 @@
 				uid = ids[1];
 
 			if (thread_state.locked !== '1') {
-				if (this.children[1].className == 'icon-star-empty') {
-					this.children[1].className = 'icon-star';
+				if (this.children[2].className == 'icon-star-empty') {
+					this.children[2].className = 'icon-star';
 					socket.emit('api:posts.favourite', {pid: pid, room_id: app.current_room});
 				}
 				else {
-					this.children[1].className = 'icon-star-empty';
+					this.children[2].className = 'icon-star-empty';
 					socket.emit('api:posts.unfavourite', {pid: pid, room_id: app.current_room});
 				}
 			}
diff --git a/public/templates/footer.tpl b/public/templates/footer.tpl
index aa0d29eee0..e3c3cf2db9 100644
--- a/public/templates/footer.tpl
+++ b/public/templates/footer.tpl
@@ -20,6 +20,7 @@
 		<button id="mobile-post-btn" type="button" class="btn btn-none"><i class="icon-plus icon-2x"></i></button>
 	</div>
 	<script type="text/javascript" src="/src/forum/footer.js"></script>
+	
 	<!-- END Forum Info -->
 </body>
 </html>
\ No newline at end of file
diff --git a/public/templates/header.tpl b/public/templates/header.tpl
index 0c8d800309..2cc230690c 100644
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -59,22 +59,13 @@
 							<a href="/users">Users</a>
 						</li>
 					</ul>
-					<ul class="nav pull-right nodebb-inline-block" id="right-menu">
+					<ul id="right-menu" class="nav pull-right nodebb-inline-block">
 						<li class="notifications dropdown text-center">
 							<a class="dropdown-toggle" data-toggle="dropdown" href="#" id="notif_dropdown"><i class="icon-circle-blank"></i></a>
 							<ul id="notif-list" class="dropdown-menu" aria-labelledby="notif_dropdown">
 								<li><a href="#"><i class="icon-refresh icon-spin"></i> Loading Notifications</a></li>
 							</ul>
 						</li>
-						<li>
-							<a id="user_label" href="">
-								<img src=""/>
-								<span></span>
-							</a>
-						</li>
-						<li>
-							<a href="/logout">Log out</a>
-						</li>
 					</ul>
 				</div>
 			</div>
diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl
index 4f7aee5441..f6c4d34333 100644
--- a/public/templates/topic.tpl
+++ b/public/templates/topic.tpl
@@ -37,7 +37,9 @@
 						<button id="ids_{main_posts.pid}_{main_posts.uid}" class="btn delete {main_posts.display_moderator_tools}" type="button"><i class="icon-trash"></i></button>
 						<button id="quote_{main_posts.pid}_{main_posts.uid}" class="btn quote" type="button"><i class="icon-quote-left"></i></button>
 
-						<button id="favs_{main_posts.pid}_{main_posts.uid}" class="favourite btn" type="button"><span class="post_rep_{main_posts.pid}">Favourite {main_posts.post_rep} </span><i class="{main_posts.fav_star_class}"></i></button>
+						<button id="favs_{main_posts.pid}_{main_posts.uid}" class="favourite btn" type="button">
+							<span>Favourite</span>
+							<span class="post_rep_{main_posts.pid}">{main_posts.post_rep} </span><i class="{main_posts.fav_star_class}"></i></button>
 						<button id="post_reply" class="btn btn-primary btn post_reply hidden-phone" type="button">Reply <i class="icon-reply"></i></button>
 					</div>
 					<div style="clear:both; margin-bottom: 10px;"></div>