diff --git a/modules/addon/addon.admin.controller.php b/modules/addon/addon.admin.controller.php
index ae7a07a5f..3a3209e7f 100644
--- a/modules/addon/addon.admin.controller.php
+++ b/modules/addon/addon.admin.controller.php
@@ -158,9 +158,9 @@
          * @brief Add-on
          * Adds Add to DB
          **/
-        function doInsert($addon, $site_srl = 0, $gtype = 'site') {
+        function doInsert($addon, $site_srl = 0, $gtype = 'site', $isUsed = 'N') {
             $args->addon = $addon;
-            $args->is_used = 'N';
+            $args->is_used = $isUsed;
             if($gtype == 'global') return executeQuery('addon.insertAddon', $args);
             $args->site_srl = $site_srl;
             return executeQuery('addon.insertSiteAddon', $args);
diff --git a/modules/addon/addon.class.php b/modules/addon/addon.class.php
index 1fb73b09b..d7c03e2d1 100644
--- a/modules/addon/addon.class.php
+++ b/modules/addon/addon.class.php
@@ -13,24 +13,17 @@
         function moduleInstall() {
             // Register to add a few
             $oAddonController = &getAdminController('addon');
-            $oAddonController->doInsert('autolink');
+            $oAddonController->doInsert('autolink', 0, 'site', 'Y');
             $oAddonController->doInsert('blogapi');
-            $oAddonController->doInsert('counter');
-            $oAddonController->doInsert('member_communication');
-            $oAddonController->doInsert('member_extra_info');
-            $oAddonController->doInsert('mobile');
-            $oAddonController->doInsert('referer');
-            $oAddonController->doInsert('resize_image');
+            $oAddonController->doInsert('counter', 0, 'site', 'Y');
+            $oAddonController->doInsert('member_communication', 0, 'site', 'Y');
+            $oAddonController->doInsert('member_extra_info', 0, 'site', 'Y');
+            $oAddonController->doInsert('mobile', 0, 'site', 'Y');
+            $oAddonController->doInsert('referer', 0, 'site', 'Y');
+            $oAddonController->doInsert('resize_image', 0, 'site', 'Y');
             $oAddonController->doInsert('openid_delegation_id');
             $oAddonController->doInsert('point_level_icon');
-            // To add a few changes to the default activation state
-            $oAddonController->doActivate('autolink');
-            $oAddonController->doActivate('counter');
-            $oAddonController->doActivate('member_communication');
-            $oAddonController->doActivate('member_extra_info');
-            $oAddonController->doActivate('mobile');
-            $oAddonController->doActivate('referer');
-            $oAddonController->doActivate('resize_image');
+
             $oAddonController->makeCacheFile(0);
             return new Object();
         }