diff --git a/templates/header.html b/templates/header.html
index e061de31..a80715ed 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -45,7 +45,7 @@
 {{/** TODO: Make this a separate template and load it via the theme docks, here for now so we can rapidly prototype the Nox theme **/}}
 {{if eq .Header.Theme.Name "nox"}}
 <div class="user_box">
-	<a href="{{.CurrentUser.Link}}"><img alt="Avatar" src="{{.CurrentUser.MicroAvatar}}"></a>
+	<a href="{{.CurrentUser.Link}}"><img alt="Avatar"src="{{.CurrentUser.MicroAvatar}}"></a>
 	<div class="option_box">
 		<a href="{{.CurrentUser.Link}}"class="username">{{.CurrentUser.Name}}</a>
 		<span class="alerts">{{lang "alerts.no_alerts_short"}}</span>
diff --git a/templates/profile_comments_row_alt.html b/templates/profile_comments_row_alt.html
index 4203deff..57f1eaf3 100644
--- a/templates/profile_comments_row_alt.html
+++ b/templates/profile_comments_row_alt.html
@@ -2,7 +2,7 @@
 <div id="post-{{.ID}}"class="rowitem passive deletable_block editable_parent comment {{.ClassName}}">
 	<div class="topRow">
 		<div class="userbit">
-			<img src="{{.MicroAvatar}}"alt="Avatar"title="{{.CreatedByName}}'s Avatar"aria-hidden="true">
+			<a href="{{.UserLink}}"><img src="{{.MicroAvatar}}"alt="Avatar"title="{{.CreatedByName}}'s Avatar"aria-hidden="true"></a>
 			<span class="nameAndTitle">
 				<a href="{{.UserLink}}"class="real_username username">{{.CreatedByName}}</a>
 				{{if .Tag}}<a class="username hide_on_mobile user_tag"style="float:right;">{{.Tag}}</a>{{end}}
diff --git a/themes/cosora/public/profile.css b/themes/cosora/public/profile.css
index fbaa7aaf..3f1f3819 100644
--- a/themes/cosora/public/profile.css
+++ b/themes/cosora/public/profile.css
@@ -5,4 +5,7 @@
 	padding: 8px;
 	margin-left: 16px;
 	margin-bottom: 12px;
+}
+.userbit > a {
+	height: 40px;
 }
\ No newline at end of file
diff --git a/themes/nox/public/profile.css b/themes/nox/public/profile.css
index df0e5ac4..5a672d6a 100644
--- a/themes/nox/public/profile.css
+++ b/themes/nox/public/profile.css
@@ -67,6 +67,9 @@
 	font-size: 17px;
 	line-height: 16px;
 }
+.userbit > a {
+	height: 40px;
+}
 .userbit img {
 	width: 40px;
 	height: 40px;