Index: token/token_comment.inc
===================================================================
--- token/token_comment.inc	(revision 37718)
+++ token/token_comment.inc	(working copy)
@@ -28,7 +28,7 @@
       $values['comment-nid']             = $comment->nid;
       $values['comment-title']           = check_plain($comment->subject);
       $values['comment-body']            = check_markup($comment->comment, $comment->format);
-      $values['comment-author-name']     = check_plain($comment->name);
+      $values['comment-author-name']     = $comment->uid ? check_plain($comment->name) : variable_get('anonymous', 'Anonymous');
       $values['comment-author-uid']      = $comment->uid;
       $values['comment-author-homepage'] = check_url($comment->homepage);