diff --git a/class2.php b/class2.php
index 26fbf6afc..c48505451 100644
--- a/class2.php
+++ b/class2.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/class2.php,v $
-|     $Revision: 1.38 $
-|     $Date: 2007-12-30 16:54:31 $
+|     $Revision: 1.39 $
+|     $Date: 2008-01-05 22:02:31 $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
@@ -1070,6 +1070,7 @@ function get_user_data($uid, $extra = "")
 	
 	//===========================================================
 	// Now look up the 'inherited' user classes
+	global $e_userclass;
 	if (!isset($e_userclass) && !is_object($e_userclass)) 
 	{
 	  require_once(e_HANDLER."userclass_class.php");
diff --git a/e107_files/bbcode/img.bb b/e107_files/bbcode/img.bb
index cfad12fb7..7965f9149 100644
--- a/e107_files/bbcode/img.bb
+++ b/e107_files/bbcode/img.bb
@@ -38,18 +38,19 @@ if (!$postID || $postID == 'admin')
 }
 else
 {
-  if(strstr($postID,'class:'))
-  {
-	$uc = substr($postID,6);
-  }
-  else
-  {
-	$uc = $postID;
-  }
-
   if ($pref['image_post'])
   {
-    if (check_class($pref['image_post_class'],'',$uc))
+	if(strstr($postID,'class:'))
+	{
+	  $uc = substr($postID,6).','.e_UC_PUBLIC;				// Not ideal, but 'Everyone' class not necessarily present
+	  $can_show = check_class($pref['image_post_class'],$uc);
+	}
+	else
+	{
+	  $uc = $postID;
+	  $can_show = check_class($pref['image_post_class'],'',$uc);
+	}
+    if ($can_show)
 	{
 	  return "<img src='".$code_text."' {$parmStr} />";
 	}