diff --git a/files/templates/header.html b/files/templates/header.html
index 03adba819..2f4f990e1 100644
--- a/files/templates/header.html
+++ b/files/templates/header.html
@@ -162,7 +162,7 @@
 					<a class="nav-link" href="{{v.url}}"><i class="fas fa-user-circle fa-fw mr-3"></i>@{{v.username}}</a>
 				</li>
 				<li class="nav-item">
-					<a class="nav-link {% if v.notifications_count %}position-relative{% endif %}" href="/notifications{% if not v.not_post_notifications_count %}?posts=true{% endif %}">
+					<a class="nav-link" href="/notifications{% if v.notifications_count and not v.not_post_notifications_count %}?posts=true{% endif %}">
 						<i class="fas fa-envelope fa-fw mr-3"></i>Inbox
 						{% if v.notifications_count %}
 						<i class="fas fa-circle text-danger position-absolute" style="left: 19px; top: 5px; font-size: 10px;{% if not v.not_post_notifications_count %}color:blue!important{% endif %}"></i>
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 452596d23..4e35ddb47 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -684,7 +684,7 @@
 
 </div>
 
-{% if u.song%}
+{% if u.song %}
 	{% if v and v.id == u.id %}
 		<div id="v_username" class="d-none">{{v.username}}</div>
 	{% else %}
diff --git a/files/templates/userpage_comments.html b/files/templates/userpage_comments.html
index f382926fc..7b00bf101 100644
--- a/files/templates/userpage_comments.html
+++ b/files/templates/userpage_comments.html
@@ -105,7 +105,11 @@
 </div>
 
 {% if u.song %}
-<div id="uid" class="d-none">{{u.id}}</div>
+	{% if v and v.id == u.id %}
+		<div id="v_username" class="d-none">{{v.username}}</div>
+	{% else %}
+		<div id="u_username" class="d-none">{{u.username}}</div>
+	{% endif %}
 {% endif %}
 
 {% if v %}
diff --git a/files/templates/userpage_private.html b/files/templates/userpage_private.html
index 0867e6141..085b9a608 100644
--- a/files/templates/userpage_private.html
+++ b/files/templates/userpage_private.html
@@ -32,7 +32,11 @@
 </div>
 
 {% if u.song %}
-<div id="uid" class="d-none">{{u.id}}</div>
+	{% if v and v.id == u.id %}
+		<div id="v_username" class="d-none">{{v.username}}</div>
+	{% else %}
+		<div id="u_username" class="d-none">{{u.username}}</div>
+	{% endif %}
 {% endif %}
 
 {% endblock %}