diff --git a/e107_handlers/application.php b/e107_handlers/application.php
index 6825e1b6d..7e1bd0a41 100644
--- a/e107_handlers/application.php
+++ b/e107_handlers/application.php
@@ -386,7 +386,10 @@ class eDispatcher
 		{
 			case 'plugin':
 				//if($custom) $custom = 'url/'.$custom;
-				define('e_CURRENT_PLUGIN', $module); // TODO Move to a better location.
+				if(!defined('e_CURRENT_PLUGIN'))
+				{
+					define('e_CURRENT_PLUGIN', $module); // TODO Move to a better location.
+				}
 				return $sc ? '{e_PLUGIN}'.$module.'url/'.$custom.'url.php' : e_PLUGIN.$module.'url/'.$custom.'url.php';
 			break;
 
diff --git a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
index 17c9b95c1..4fc8e0073 100644
--- a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
+++ b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
@@ -71,7 +71,10 @@ class plugin_forum_view_shortcodes extends e_shortcode
 	{
 	//	return print_a($this->postInfo['post_entry'],true);
 		$emote = (isset($this->postInfo['post_options']['no_emote']) ? ',emotes_off' : '');
-		return e107::getParser()->toHTML($this->postInfo['post_entry'], true, 'USER_BODY'.$emote, 'class:'.$this->postInfo['user_class']);
+
+		$uclass = (!empty($this->postInfo['user_class'])) ? $this->postInfo['user_class'] : 0;
+
+		return e107::getParser()->toHTML($this->postInfo['post_entry'], true, 'USER_BODY'.$emote, 'class:'.$uclass);
 	}
 
 	function sc_postdeleted()
@@ -287,7 +290,7 @@ class plugin_forum_view_shortcodes extends e_shortcode
 
 	function sc_website()
 	{
-		if ($this->postInfo['user_homepage']) {
+		if (!empty($this->postInfo['user_homepage'])) {
 			return LAN_FORUM_2034.': '.$this->postInfo['user_homepage'].'<br />';
 		}
 	}