diff --git a/e107_core/shortcodes/single/user_avatar.php b/e107_core/shortcodes/single/user_avatar.php
index 73af5a300..d3e2ce0ea 100644
--- a/e107_core/shortcodes/single/user_avatar.php
+++ b/e107_core/shortcodes/single/user_avatar.php
@@ -1,6 +1,6 @@
 <?php
 // $Id$
-function user_avatar_shortcode($parm='')
+function user_avatar_shortcode($parm=null)
 {
 	global $loop_uid;
 	
@@ -27,7 +27,7 @@ function user_avatar_shortcode($parm='')
 			$image=$row['user_image'];
 		}
 	}
-	elseif($parm)
+	elseif(!is_null($parm))
 	{
 		$image=$parm;
 	}
diff --git a/e107_plugins/chatbox_menu/chatbox_menu.php b/e107_plugins/chatbox_menu/chatbox_menu.php
index b520ac4ae..50a0b9d43 100644
--- a/e107_plugins/chatbox_menu/chatbox_menu.php
+++ b/e107_plugins/chatbox_menu/chatbox_menu.php
@@ -284,7 +284,7 @@ if(!$text = $e107cache->retrieve("nq_chatbox"))
 	define("CB_MOD", check_class($pref['cb_mod']));
 
 	$qry = "
-	SELECT c.*, u.user_name FROM #chatbox AS c
+	SELECT c.*, u.user_name, u.user_image FROM #chatbox AS c
 	LEFT JOIN #user AS u ON SUBSTRING_INDEX(c.cb_nick,'.',1) = u.user_id
 	ORDER BY c.cb_datestamp DESC LIMIT 0, ".intval($chatbox_posts);