diff --git a/mozilla/webtools/addons/public/tpl/addon.tpl b/mozilla/webtools/addons/public/tpl/addon.tpl
index 87ef35e9f0e..aa8a9598982 100644
--- a/mozilla/webtools/addons/public/tpl/addon.tpl
+++ b/mozilla/webtools/addons/public/tpl/addon.tpl
@@ -107,8 +107,8 @@ Works with:
 {$addon->Comments[comments].CommentName|strip_tags}
 {else}
 {$addon->Comments[comments].UserName|strip_tags}
-{/if}
-, {$addon->Comments[comments].CommentDate|date_format}</p>
+{/if},
+{$addon->Comments[comments].CommentDate|date_format}</p>
 <p class="opinions-text">{$addon->Comments[comments].CommentNote|strip_tags|nl2br}</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 09356d34877..7b49a60327f 100644
--- a/mozilla/webtools/addons/public/tpl/comments.tpl
+++ b/mozilla/webtools/addons/public/tpl/comments.tpl
@@ -60,8 +60,8 @@ Next Page &raquo;
 {$addon->Comments[comments].CommentName|strip_tags}
 {else}
 {$addon->Comments[comments].UserName|strip_tags}
-{/if}
-, {$addon->Comments[comments].CommentDate|date_format}</p>
+{/if},
+{$addon->Comments[comments].CommentDate|date_format}</p>
 <p class="opinions-text">{$addon->Comments[comments].CommentNote|strip_tags|nl2br}</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>