diff --git a/Web/Presenters/templates/components/comment.xml b/Web/Presenters/templates/components/comment.xml
index 774fc4d9..5671ac54 100644
--- a/Web/Presenters/templates/components/comment.xml
+++ b/Web/Presenters/templates/components/comment.xml
@@ -7,10 +7,12 @@
     <tbody>
         <tr>
             <td width="30" valign="top">
-                <img
-                    src="{$author->getAvatarURL()}"
-                    width="30"
-                    class="cCompactAvatars" />
+                <a href="{$author->getURL()}">
+                    <img
+                        src="{$author->getAvatarURL()}"
+                        width="30"
+                        class="cCompactAvatars" />
+                </a>
             </td>
             <td width="100%" valign="top">
                 <div class="post-author">
diff --git a/Web/Presenters/templates/components/post/microblogpost.xml b/Web/Presenters/templates/components/post/microblogpost.xml
index 2e35c0f0..d50d9b02 100644
--- a/Web/Presenters/templates/components/post/microblogpost.xml
+++ b/Web/Presenters/templates/components/post/microblogpost.xml
@@ -8,15 +8,17 @@
     <tbody>
         <tr>
             <td width="54" valign="top">
-                <img
-                    src="{$author->getAvatarURL()}"
-                    width="{ifset $compact}25{else}50{/ifset}" 
-                    {ifset $compact}class="cCompactAvatars"{/ifset} />
-                        {if !$post->isPostedOnBehalfOfGroup() && !$compact}
-                            <span n:if="$author->isOnline()" class="post-online">
-                                {_online}
-                            </span>
-                {/if}
+                <a href="{$author->getURL()}">
+                    <img
+                        src="{$author->getAvatarURL()}"
+                        width="{ifset $compact}25{else}50{/ifset}" 
+                        {ifset $compact}class="cCompactAvatars"{/ifset} />
+                            {if !$post->isPostedOnBehalfOfGroup() && !$compact}
+                                <span n:if="$author->isOnline()" class="post-online">
+                                    {_online}
+                                </span>
+                    {/if}
+                </a>
             </td>
             <td width="100%" valign="top">
                 <div class="post-author">
diff --git a/Web/Presenters/templates/components/post/oldpost.xml b/Web/Presenters/templates/components/post/oldpost.xml
index f2769636..6c2958e7 100644
--- a/Web/Presenters/templates/components/post/oldpost.xml
+++ b/Web/Presenters/templates/components/post/oldpost.xml
@@ -4,14 +4,17 @@
     <tbody>
         <tr>
             <td width="54" valign="top">
-                <img
-                    src="{$author->getAvatarURL()}"
-                    width="50" />
+                <a href="{$author->getURL()}">
+                    <img
+                        src="{$author->getAvatarURL()}"
+                        width="50" />
+                </a>
                        {if !$post->isPostedOnBehalfOfGroup() && !($compact ?? false)}
                             <span n:if="$author->isOnline()" class="post-online">
                                 {_online}
                             </span>
                         {/if}
+                
             </td>
             <td width="100%" valign="top">
                 <div class="post-author">