diff --git a/mozilla/webtools/addons/public/tpl/addon.tpl b/mozilla/webtools/addons/public/tpl/addon.tpl
index eca676b3af4..31e43636ebc 100644
--- a/mozilla/webtools/addons/public/tpl/addon.tpl
+++ b/mozilla/webtools/addons/public/tpl/addon.tpl
@@ -102,7 +102,13 @@ Works with:
 <li>
 <div class="opinions-vote">{$addon->Comments[comments].CommentVote} <span class="opinions-caption">out of 5</span></div>
 <h4 class="opinions-title">{$addon->Comments[comments].CommentTitle|strip_tags}</h4>
-<p class="opinions-info">by {$addon->Comments[comments].CommentName|strip_tags}, {$addon->Comments[comments].CommentDate|date_format}</p>
+<p class="opinions-info">by 
+{if $addon->Comments[comments].CommentName}
+{$addon->Comments[comments].CommentName|strip_tags}
+{else}
+{$addon->Comments[comments].UserName|strip_tags}
+{/if}
+, {$addon->Comments[comments].CommentDate|date_format}</p>
 <p class="opinions-text">{$addon->Comments[comments].CommentNote|strip_tags}</p>
 <p class="opinions-helpful"><strong>{$addon->Comments[comments].helpful_yes}</strong> out of <strong>{$addon->Comments[comments].helpful_total}</strong> viewers found this comment helpful<br>
 Was this comment helpful? <a href="{$config.webpath}/ratecomment.php?aid={$addon->ID}&amp;cid={$addon->Comments[comments].CommentID}&amp;r=yes&amp;app={$app}">Yes</a> &#124; <a href="{$config.webpath}/ratecomment.php?aid={$addon->ID}&amp;cid={$addon->Comments[comments].CommentID}&amp;r=no&amp;app={$app}">No</a></p>
diff --git a/mozilla/webtools/addons/public/tpl/comments.tpl b/mozilla/webtools/addons/public/tpl/comments.tpl
index 7911d98be63..c78c644244a 100644
--- a/mozilla/webtools/addons/public/tpl/comments.tpl
+++ b/mozilla/webtools/addons/public/tpl/comments.tpl
@@ -55,7 +55,13 @@ Next Page &raquo;
 <li>
 <div class="opinions-vote">{$addon->Comments[comments].CommentVote}<span class="opinions-caption">out of 5</span></div>
 <h4 class="opinions-title">{$addon->Comments[comments].CommentTitle|strip_tags}</h4>
-<p class="opinions-info">by {$addon->Comments[comments].CommentName|strip_tags}, {$addon->Comments[comments].CommentDate|date_format}</p>
+<p class="opinions-info">by 
+{if $addon->Comments[comments].CommentName}
+{$addon->Comments[comments].CommentName|strip_tags}
+{else}
+{$addon->Comments[comments].UserName|strip_tags}
+{/if}
+, {$addon->Comments[comments].CommentDate|date_format}</p>
 <p class="opinions-text">{$addon->Comments[comments].CommentNote|strip_tags}</p>
 <p class="opinions-helpful"><strong>{$addon->Comments[comments].helpful_yes}</strong> out of <strong>{$addon->Comments[comments].helpful_total}</strong> viewers found this comment helpful<br>
 Was this comment helpful? <a href="{$config.webpath}/ratecomment.php?aid={$addon->ID}&amp;cid={$addon->Comments[comments].CommentID}&amp;r=yes">Yes</a> &#124; <a href="{$config.webpath}/ratecomment.php?aid={$addon->ID}&amp;cid={$addon->Comments[comments].CommentID}&amp;r=no">No</a></p>
diff --git a/mozilla/webtools/addons/shared/lib/addon.class.php b/mozilla/webtools/addons/shared/lib/addon.class.php
index d2630222eaa..691e514ad18 100644
--- a/mozilla/webtools/addons/shared/lib/addon.class.php
+++ b/mozilla/webtools/addons/shared/lib/addon.class.php
@@ -323,9 +323,14 @@ class AddOn extends AMO_Object {
                 CommentVote,
                 `helpful-yes` as helpful_yes,
                 `helpful-no` as helpful_no,
-                `helpful-yes` + `helpful-no` as helpful_total
+                `helpful-yes` + `helpful-no` as helpful_total,
+                UserName
             FROM
                 feedback
+            LEFT JOIN
+                userprofiles
+            ON
+                userprofiles.UserID = feedback.UserID
             WHERE
                 ID = '{$this->ID}' AND
                 CommentVote IS NOT NULL