diff --git a/WebsitePanel.WHMCSModule/changelog.html b/WebsitePanel.WHMCSModule/changelog.html
index e2b32726..cd86f995 100644
--- a/WebsitePanel.WHMCSModule/changelog.html
+++ b/WebsitePanel.WHMCSModule/changelog.html
@@ -9,6 +9,10 @@
 <h1>WHMCS WebsitePanel Server Module</h1>
 <p style="color: #FF0000">DO NOT CONTACT WHMCS FOR SUPPORT WITH THIS MODULE</p>
 <h3>Changelog / Updates</h3>
+<p>10-25-2014 (v3.0.4)</p>
+<ul>
+	<li>Updated the bandwidth / diskspace usage - Incorrect query data resulted in calculation being incomplete or incorrect</li>
+</ul>
 <p>2-24-2014 (v3.0.3)</p>
 <ul>
   <li>Added: WHMCS module log debug calls.
diff --git a/WebsitePanel.WHMCSModule/modules/addons/websitepanel_addons/hooks.php b/WebsitePanel.WHMCSModule/modules/addons/websitepanel_addons/hooks.php
index bde9b7d4..90c5b4f8 100644
--- a/WebsitePanel.WHMCSModule/modules/addons/websitepanel_addons/hooks.php
+++ b/WebsitePanel.WHMCSModule/modules/addons/websitepanel_addons/hooks.php
@@ -37,7 +37,7 @@ require_once(ROOTDIR. '/modules/servers/websitepanel/enterpriseserver.php');
  * @link http://www.websitepanel.net/
  * @access public
  * @name websitepanel_EnterpriseServer
- * @version 3.0.3
+ * @version 3.0.4
  * @package WHMCS
  * @final
  */
diff --git a/WebsitePanel.WHMCSModule/modules/addons/websitepanel_addons/websitepanel_addons.php b/WebsitePanel.WHMCSModule/modules/addons/websitepanel_addons/websitepanel_addons.php
index 89a04ea1..106ab070 100644
--- a/WebsitePanel.WHMCSModule/modules/addons/websitepanel_addons/websitepanel_addons.php
+++ b/WebsitePanel.WHMCSModule/modules/addons/websitepanel_addons/websitepanel_addons.php
@@ -35,7 +35,7 @@
  * @link http://www.websitepanel.net/
  * @access public
  * @name websitepanel_EnterpriseServer
- * @version 3.0.3
+ * @version 3.0.4
  * @package WHMCS
  * @final
  */
@@ -50,7 +50,7 @@ function websitepanel_addons_config()
 {
     return array('name' => 'WebsitePanel Addons Automation',
                  'description' => 'Automates WHMCS product addons with WebsitePanel Addons',
-                 'version' => '3.0.3',
+                 'version' => '3.0.4',
                  'author' => 'Christopher York');
 }
 
diff --git a/WebsitePanel.WHMCSModule/modules/addons/websitepanel_sync/hooks.php b/WebsitePanel.WHMCSModule/modules/addons/websitepanel_sync/hooks.php
index aee3f71b..1f2c6077 100644
--- a/WebsitePanel.WHMCSModule/modules/addons/websitepanel_sync/hooks.php
+++ b/WebsitePanel.WHMCSModule/modules/addons/websitepanel_sync/hooks.php
@@ -37,7 +37,7 @@ require_once(ROOTDIR. '/modules/servers/websitepanel/enterpriseserver.php');
  * @link http://www.websitepanel.net/
  * @access public
  * @name websitepanel
- * @version 3.0.3
+ * @version 3.0.4
  * @package WHMCS
  */
 
diff --git a/WebsitePanel.WHMCSModule/modules/addons/websitepanel_sync/websitepanel_sync.php b/WebsitePanel.WHMCSModule/modules/addons/websitepanel_sync/websitepanel_sync.php
index b5bc3ef0..d9a56c4e 100644
--- a/WebsitePanel.WHMCSModule/modules/addons/websitepanel_sync/websitepanel_sync.php
+++ b/WebsitePanel.WHMCSModule/modules/addons/websitepanel_sync/websitepanel_sync.php
@@ -34,7 +34,7 @@
  * @link http://www.websitepanel.net/
  * @access public
  * @name websitepanel
- * @version 3.0.3
+ * @version 3.0.4
  * @package WHMCS
  */
 
@@ -48,7 +48,7 @@ function websitepanel_sync_config()
 {
     return array('name' => 'WebsitePanel Sync Automation',
                  'description' => 'Syncs WHMCS client details / contact changes with WebsitePanel accounts',
-                 'version' => '3.0.3',
+                 'version' => '3.0.4',
                  'author' => 'Christopher York');
 }
 
diff --git a/WebsitePanel.WHMCSModule/modules/servers/websitepanel/enterpriseserver.php b/WebsitePanel.WHMCSModule/modules/servers/websitepanel/enterpriseserver.php
index b3bd4afb..deb693fa 100644
--- a/WebsitePanel.WHMCSModule/modules/servers/websitepanel/enterpriseserver.php
+++ b/WebsitePanel.WHMCSModule/modules/servers/websitepanel/enterpriseserver.php
@@ -35,7 +35,7 @@
  * @link http://www.websitepanel.net/
  * @access public
  * @name websitepanel_EnterpriseServer
- * @version 3.0.3
+ * @version 3.0.4
  * @package WHMCS
  * @final
  */
diff --git a/WebsitePanel.WHMCSModule/modules/servers/websitepanel/functions.php b/WebsitePanel.WHMCSModule/modules/servers/websitepanel/functions.php
index fdf0cc28..8afd5a84 100644
--- a/WebsitePanel.WHMCSModule/modules/servers/websitepanel/functions.php
+++ b/WebsitePanel.WHMCSModule/modules/servers/websitepanel/functions.php
@@ -34,7 +34,7 @@
  * @link http://www.websitepanel.net/
  * @access public
  * @name websitepanel
- * @version 3.0.3
+ * @version 3.0.4
  * @package WHMCS
  */
 
diff --git a/WebsitePanel.WHMCSModule/modules/servers/websitepanel/websitepanel.php b/WebsitePanel.WHMCSModule/modules/servers/websitepanel/websitepanel.php
index 03ec01b4..82b0de17 100644
--- a/WebsitePanel.WHMCSModule/modules/servers/websitepanel/websitepanel.php
+++ b/WebsitePanel.WHMCSModule/modules/servers/websitepanel/websitepanel.php
@@ -38,7 +38,7 @@ require_once(ROOTDIR. '/modules/servers/websitepanel/functions.php');
  * @link http://www.websitepanel.net/
  * @access public
  * @name websitepanel
- * @version 3.0.3
+ * @version 3.0.4
  * @package WHMCS
  */
 
@@ -543,7 +543,7 @@ function websitepanel_UsageUpdate($params)
 	
 	// Query for WebsitePanel user accounts assigned to this server
 	// Only services that have packages that have "Tick to update diskpace / bandwidth in WHMCS" enabled
-	$result = full_query("SELECT h.id AS serviceid, h.userid AS userid, h.username AS username, h.regdate AS regdate, p.configoption2 AS configoption2, p.configoption3 AS configoption3, p.configoption6 AS configoption6 FROM `tblhosting` AS h, `tblproducts` AS p WHERE h.server = 17 AND h.packageid = p.id AND p.configoption16 = 'on' AND h.domainstatus IN ('Active', 'Suspended')");
+	$result = full_query("SELECT h.id AS serviceid, h.userid AS userid, h.username AS username, h.regdate AS regdate, p.configoption2 AS configoption2, p.configoption3 AS configoption3, p.configoption6 AS configoption6 FROM `tblhosting` AS h, `tblproducts` AS p WHERE h.server IN (SELECT `id` FROM `tblservers` WHERE `type` = 'websitepanel') AND h.packageid = p.id AND p.configoption16 = 'on' AND h.domainstatus IN ('Active', 'Suspended')");
 	while (($row = mysql_fetch_array($result)) != false)
 	{
 		// Start processing the users usage