diff --git a/plone/app/discussion/browser/comments.pt b/plone/app/discussion/browser/comments.pt
index b079652..3919524 100644
--- a/plone/app/discussion/browser/comments.pt
+++ b/plone/app/discussion/browser/comments.pt
@@ -26,16 +26,16 @@
                  tal:define="reply reply_dict/comment;
                              depth reply_dict/depth|python:0;
                              creator reply/Creator;
-                             commenter_home_url python:view.get_commenter_home_url(reply.author_username);
-                             portrait python:view.get_commenter_portrait(reply.author_username);
+                             author_home_url string:${context/portal_url}/author/${reply/author_username};
+                             portrait python:here.portal_membership.getPersonalPortrait(reply.author_username);
                              anonymous_creator python:creator in ('Anonymous User', '');"
                  tal:attributes="class python:'comment replyTreeLevel'+str(depth);
                                  style string:margin-left: ${depth}em;
                                  id string:comment-${reply/id}">
 
-                <div class="commentImage" tal:condition="not:anonymous_creator">
-                    <a href="" tal:condition="python: commenter_home_url and not isAnon"
-                               tal:attributes="href commenter_home_url">
+                <div class="commentImage">
+                    <a href="" tal:condition="not:isAnon"
+                               tal:attributes="href author_home_url">
                          <img src="defaultUser.gif"
                               alt=""
                               border="0"
@@ -47,7 +47,7 @@
                          alt=""
                          border="0"
                          width="75"
-                         tal:condition="python: isAnon or not commenter_home_url"
+                         tal:condition="isAnon"
                          tal:attributes="src portrait/absolute_url;
                                          alt reply/creator" />
                 </div>
@@ -60,11 +60,11 @@
 
                 <div class="documentByLine">
                         <tal:posted i18n:translate="label_comment_by">Posted by</tal:posted>
-                        <tal:name condition="not:anonymous_creator">
+                        <tal:name>
                             <a href=""
                                tal:condition="not:isAnon"
                                tal:content="creator"
-                               tal:attributes="href commenter_home_url">
+                               tal:attributes="href author_home_url">
                                 Poster Name
                             </a>
                             <span tal:condition="isAnon"