diff --git a/e107_core/shortcodes/single/user_avatar.php b/e107_core/shortcodes/single/user_avatar.php
index 987369293..a7f24dd70 100644
--- a/e107_core/shortcodes/single/user_avatar.php
+++ b/e107_core/shortcodes/single/user_avatar.php
@@ -1,33 +1,65 @@
-global $loop_uid;
-if(intval($loop_uid) > 0 && trim($parm) == "")
-{
-	$parm = $loop_uid;
-}
+// <?php
+// $Id$
 
-if(is_numeric($parm))
-{
-	if($parm == USERID)
+	global $loop_uid;
+	
+	return $parm;
+	
+	$height 	= e107::getPref("im_height");
+	$width 		= e107::getPref("im_width");
+	$tp 		= e107::getParser();
+	
+	if(intval($loop_uid) > 0 && trim($parm) == "")
 	{
-		$image = USERIMAGE;
+		$parm = $loop_uid;
+	}
+	
+	if(is_numeric($parm))
+	{
+		if($parm == USERID)
+		{
+			$image = USERIMAGE;
+		}
+		else
+		{
+			$row = get_user_data(intval($parm));
+			$image=$row['user_image'];
+		}
+	}
+	elseif($parm)
+	{
+		$image=$parm;
 	}
 	else
 	{
-		$row = get_user_data(intval($parm));
-		$image=$row['user_image'];
+		$image = USERIMAGE;
 	}
-}
-elseif($parm)
-{
-	$image=$parm;
-}
-else
-{
-	$image = USERIMAGE;
-}
-if(!$image) { return; }
-require_once(e_HANDLER.'avatar_handler.php');
-$avatar = avatar($image);
-if($avatar)
-{
-	return "<div class='spacer'><img src='".avatar($image)."' alt='' /></div><br />";
-}
+	
+// 	if(!$image) { return; }
+	
+	
+	
+	//require_once(e_HANDLER.'avatar_handler.php');
+//	$avatar = avatar($image);
+	
+	if (vartrue($image)) 
+	{
+		$img = (strpos($image,"://")!==false) ? $image : $tp->thumbUrl(e_MEDIA."avatars/".$image,"aw=".$width."&ah=".$height);
+		$text = "<img class='user-avatar' src='".$img."' alt='' style='width:".$width."px; height:".$height."px' />";
+	}
+	else
+	{
+		$img = $tp->thumbUrl(e_IMAGE."generic/blank_avatar.jpg","aw=".$width."&ah=".$height);
+		$text = "<img class='user-avatar' src='".$img."' alt='' />";
+	}
+	
+	return $text;
+	
+	
+	//if($avatar)
+	//{
+	//	return "<div class='spacer'><img src='".avatar($image)."' alt='' /></div><br />";
+	//}
+
+
+?>
\ No newline at end of file