diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php
index ad131e43b..53436bc9a 100644
--- a/e107_admin/plugin.php
+++ b/e107_admin/plugin.php
@@ -666,7 +666,7 @@ class pluginManager{
 	//  XXX Suhosin has a 512 char limit for $_GET strings.
 		e107::getDebug()->log($data['plugin_name'].' : '.strlen($base64)."<br />".print_a($data,true)); //FIXME - enable when needed to debug.
 		*/
-		
+
 		// Temporary Pop-up version. 
 	//	$dicon = '<a class="e-modal" href="'.$data['plugin_url'].'" rel="external" data-modal-caption="'.$data['plugin_name']." ".$data['plugin_version'].'"  target="_blank" ><img class="top" src="'.e_IMAGE_ABS.'icons/download_32.png" alt=""  /></a>';
 		
@@ -718,6 +718,7 @@ class pluginManager{
 
 		if($mp->download($data['plugin_id'], $data['plugin_mode'], 'plugin'))
 		{
+			$this -> pluginCheck(true); // rescan the plugin directory
 			$text = e107::getPlugin()->install($data['plugin_folder']); 
 
 			$mes->addInfo($text); 
diff --git a/e107_admin/theme.php b/e107_admin/theme.php
index 57a8faaf0..b3933ad48 100644
--- a/e107_admin/theme.php
+++ b/e107_admin/theme.php
@@ -164,6 +164,17 @@ if($mode == 'download' && !empty($_GET['src']))
 			return true;
 		}
 
+		if(e_DEBUG === true)
+		{
+			echo "<b>DEBUG MODE ACTIVE (no downloading)</b><br />";
+			echo '$_GET: ';
+			print_a($_GET);
+
+			echo 'base64 decoded and parsed as $data:';
+			print_a($data);
+			return false;
+		}
+
 		
 		$mp = $themec->getMarketplace();	
 	 	$mes->addSuccess(TPVLAN_85);   
diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php
index b035e0b0a..857de7a17 100644
--- a/e107_handlers/theme_handler.php
+++ b/e107_handlers/theme_handler.php
@@ -1076,9 +1076,17 @@ class themeHandler
 
 		if($_GET['mode'] == 'online')
 		{
+			$srcData = array(
+				'id'    => $theme['id'],
+				'url'   => $theme['url'],
+				'mode'  => $theme['mode'],
+				'price' => $theme['price']
+			);
 
-			$d = http_build_query($theme,false,'&');
-			$url = e_SELF."?src=".base64_encode($d);
+			$d = http_build_query($srcData,false,'&');
+			$base64 = base64_encode($d);
+		//	e107::getDebug()->log($theme['name'].': '.strlen($base64));
+			$url = e_SELF."?src=".$base64;
 			$id = $frm->name2id($theme['name']);
 			$LAN_DOWNLOAD = ($theme['price'] > 0) ? LAN_PURCHASE."/".LAN_DOWN_THEME : LAN_DOWN_THEME;
 			
@@ -1095,7 +1103,7 @@ class themeHandler
 			}
 			*/
 			
-			$downloadUrl = e_SELF.'?mode=download&amp;action='.$action.'&amp;src='.base64_encode($d);//$url.'&amp;action=download';
+			$downloadUrl = e_SELF.'?mode=download&src='.base64_encode($d);//$url.'&amp;action=download';
 			$infoUrl = $url.'&amp;action=info';
 			
 			$viewUrl = $theme['url'];