diff --git a/e107_admin/update_routines.php b/e107_admin/update_routines.php
index dcddfbb97..1918bcba2 100644
--- a/e107_admin/update_routines.php
+++ b/e107_admin/update_routines.php
@@ -221,7 +221,7 @@ class e107Update
 	function updatePlugin($path)
 	{
 		e107::getPlugin()->install_plugin_xml($path, 'upgrade');
-		e107::getPlugin()->save_addon_prefs(); // Rebuild addon prefs. 
+		// e107::getPlugin()->save_addon_prefs(); // Rebuild addon prefs.
 		e107::getMessage()->reset(E_MESSAGE_INFO); 
 		e107::getMessage()->addSuccess(LAN_UPDATED." : ".$path);
 		
diff --git a/e107_handlers/plugin_class.php b/e107_handlers/plugin_class.php
index e8d2e3c72..90ce3f475 100644
--- a/e107_handlers/plugin_class.php
+++ b/e107_handlers/plugin_class.php
@@ -2308,6 +2308,8 @@ class e107plugin
 
 		e107::getConfig('core')->save(true, false, false);
 
+		$this->save_addon_prefs('update');
+
 		/*	if($function == 'install')
 		 {
 		 if(isset($plug_vars['management']['installDone'][0]))
@@ -3859,7 +3861,7 @@ class e107plugin
 	 */
 	function save_addon_prefs($mode = 'upgrade') 
 	{
-		e107::getMessage()->addDebug('Running save_addon_prefs('.$mode.')'); 	
+		$this->log('Running save_addon_prefs('.$mode.')');
 		
 		$sql = e107::getDb();
 		$core = e107::getConfig('core');
@@ -4101,6 +4103,8 @@ class e107plugin
 			echo $plugin_path." = ".implode(",", $p_addons)."<br />";
 		}
 
+		$this->log("Detected Addons: ".print_a($p_addons,true));
+
 		return implode(",", $p_addons);
 	}