diff --git a/e107_handlers/comment_class.php b/e107_handlers/comment_class.php
index ca2233937..8f933101e 100644
--- a/e107_handlers/comment_class.php
+++ b/e107_handlers/comment_class.php
@@ -1489,6 +1489,7 @@ class comment
 					//author - no ned to split now
 					$comment_author_id = $row['comment_author_id'];
 					$ret['comment_author_id'] = $comment_author_id ;
+					$ret['comment_author_image'] = $row['user_image'];
 					$comment_author_name = $row['comment_author_name'];
 					$ret['comment_author'] = (USERID ? "<a href='".e107::getUrl()->create('user/profile/view', array('id' => $comment_author_id, 'name' => $comment_author_name))."'>".$comment_author_name."</a>" : $comment_author_name);
 					//comment text
diff --git a/e107_plugins/comment_menu/comment_menu_shortcodes.php b/e107_plugins/comment_menu/comment_menu_shortcodes.php
index 194f18cbe..5aff2eeab 100644
--- a/e107_plugins/comment_menu/comment_menu_shortcodes.php
+++ b/e107_plugins/comment_menu/comment_menu_shortcodes.php
@@ -68,6 +68,12 @@ class comment_menu_shortcodes extends e_shortcode
 	{
 		return $this->var['comment_author'];
 	}
+
+	function sc_cm_author_avatar($parm=null)
+	{
+		$data = array('user_id'=>$this->var['comment_author_id'], 'user_image'=>$this->var['comment_author_image']);
+		return e107::getParser()->toAvatar($data, $parm);
+	}
 	
 	
 	function sc_cm_comment($parm='')
diff --git a/e107_plugins/comment_menu/comment_menu_template.php b/e107_plugins/comment_menu/comment_menu_template.php
index 6ee1d84a9..e0724381c 100644
--- a/e107_plugins/comment_menu/comment_menu_template.php
+++ b/e107_plugins/comment_menu/comment_menu_template.php
@@ -26,7 +26,7 @@ $sc_style['CM_DATESTAMP']['post'] = "";
 $sc_style['CM_COMMENT']['pre'] = "";
 $sc_style['CM_COMMENT']['post'] = "";
 
-// $SC_WRAPPER['CM_AUTHOR'] = CM_L13."{---}"; //XXX Not working at time of review
+// $SC_WRAPPER['CM_AUTHOR'] = CM_L13."{---}"; //XXX Not working as template is loaded the old way.
 
 if (!isset($COMMENT_MENU_TEMPLATE))
 {
@@ -35,9 +35,13 @@ if (!isset($COMMENT_MENU_TEMPLATE))
 	$COMMENT_MENU_TEMPLATE['item'] = "<li>
 	{CM_URL_PRE}{CM_TYPE} {CM_HEADING}{CM_URL_POST}
 	<div>{CM_COMMENT}</div>
-	<small class='text-muted muted'>{CM_AUTHOR} {CM_DATESTAMP}</small>
+	<small class='text-muted muted'> {CM_AUTHOR} {CM_DATESTAMP}</small>
 	</li>";
 	
 	$COMMENT_MENU_TEMPLATE['end'] = "</ul>";
+
+	// {CM_AUTHOR_AVATAR: shape=circle}
+
+
 }
 ?>
\ No newline at end of file