diff --git a/e107_files/bbcode/img.bb b/e107_files/bbcode/img.bb
index 7c200fdcf..28a8ae48d 100644
--- a/e107_files/bbcode/img.bb
+++ b/e107_files/bbcode/img.bb
@@ -7,20 +7,22 @@ $code_text = str_replace($search, $replace, $code_text);
 unset($imgParms);
 $imgParms['class']="bbcode";  
 $imgParms['alt']='';
-$imgParms['style']="vertical-align:middle; border:0";
 
 $code_text = $tp -> toAttribute($code_text);
 
-if($parm) {
+if($parm)
+{
 	$parm = preg_replace('#onerror *=#i','',$parm);
 	$parm = str_replace("amp;", "&", $parm);
 	parse_str($parm,$tmp);
-	foreach($tmp as $p => $v) {
+    foreach($tmp as $p => $v)
+	{
 		$imgParms[$p]=$v;
 	}
 }
 $parmStr="";
-foreach($imgParms as $k => $v) {
+foreach($imgParms as $k => $v)
+{
 	$parmStr .= $tp -> toAttribute($k)."='".$tp -> toAttribute($v)."' ";
 }
 
@@ -30,20 +32,28 @@ if((strpos($code_text,'../') === FALSE) && file_exists(e_IMAGE."newspost_images/
 	$code_text = e_IMAGE."newspost_images/".$code_text;
 }
 
-if (!$postID) {
+if (!$postID || $postID == 'admin')
+{
 	return "<img src='".$code_text."' {$parmStr} />";
-} else {
-	if(strstr($postID,'class:')) {
+}
+else
+{
+    if(strstr($postID,'class:'))
+	{
 		$uc = substr($postID,6);
 	}
-	if ($pref['image_post']) {
-		if(!isset($uc) || ($uc == '')) {
-			if (!function_exists('e107_userGetuserclass')) {
+    if ($pref['image_post'])
+	{
+        if(!isset($uc) || ($uc == ''))
+		{
+            if (!function_exists('e107_userGetuserclass'))
+			{
 				require_once(e_HANDLER.'user_func.php');
 			}
 			$uc = e107_userGetuserclass($postID);
 		}
-		if (check_class($pref['image_post_class'],$uc)) {
+        if (check_class($pref['image_post_class'],$uc))
+		{
 			return "<img src='".$code_text."' {$parmStr} />";
 		}
 		else
@@ -53,10 +63,13 @@ if (!$postID) {
 	}
 	else
 	{
-		if ($pref['image_post_disabled_method']) {
+        if ($pref['image_post_disabled_method'])
+		{
 			return '[ image disabled ]';
-		} else {
+        }
+		else
+		{
 			return "Image: $code_text";
 		}
 	}
-}
\ No newline at end of file
+}