diff --git a/interface/lib/classes/quota_lib.inc.php b/interface/lib/classes/quota_lib.inc.php
index c5a442e98a699a673f7dc281a88eb33869474d22..55b2aa8571a13fedcca57d07104d3c9064a4649e 100644
--- a/interface/lib/classes/quota_lib.inc.php
+++ b/interface/lib/classes/quota_lib.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 class quota_lib {
-	public function get_quota_data($groupid = null, $readable = true) {
+	public function get_quota_data($clientid = null, $readable = true) {
 		global $app; 
 		
 		$tmp_rec =  $app->db->queryAllRecords("SELECT data from monitor_data WHERE type = 'harddisk_quota' ORDER BY created DESC");
@@ -13,8 +13,8 @@ class quota_lib {
 		}
 		//print_r($monitor_data);
 		
-		if($groupid != null){
-			$sql_where = " AND sys_groupid = ".$groupid;
+		if($clientid != null){
+			$sql_where = " AND sys_groupid = (SELECT default_group FROM sys_user WHERE client_id=".$clientid.")";
 		}
 		
 		// select websites belonging to client
@@ -93,7 +93,7 @@ class quota_lib {
 		return $sites;
 	}
 
-	public function get_mailquota_data($groupid = null, $readable = true) {
+	public function get_mailquota_data($clientid = null, $readable = true) {
 		global $app;
 		
 		$tmp_rec =  $app->db->queryAllRecords("SELECT data from monitor_data WHERE type = 'email_quota' ORDER BY created DESC");
@@ -111,8 +111,8 @@ class quota_lib {
 		}
 		//print_r($monitor_data);
 		
-		if($groupid != null){
-			$sql_where = " AND sys_groupid = ".$groupid;
+		if($clientid != null){
+			$sql_where = " AND sys_groupid = (SELECT default_group FROM sys_user WHERE client_id=".$clientid.")";
 		}
 		
 		
diff --git a/interface/lib/classes/remote.d/mail.inc.php b/interface/lib/classes/remote.d/mail.inc.php
index ef37c61f8452972659d4e97d019b8e63a3fb3ece..d97f575ab9545d817ac2aba3e4e85ef65858dff0 100644
--- a/interface/lib/classes/remote.d/mail.inc.php
+++ b/interface/lib/classes/remote.d/mail.inc.php
@@ -1025,7 +1025,7 @@ class remoting_mail extends remoting {
 	}
 
 	//** quota functions -----------------------------------------------------------------------------------
-	public function mailquota_get_by_user($session_id, $group_id)
+	public function mailquota_get_by_user($session_id, $client_id)
 	{
 		global $app;
 		$app->uses('quota_lib');
@@ -1034,9 +1034,9 @@ class remoting_mail extends remoting {
 			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
 		}
-		$group_id = $app->functions->intval($group_id);
+		$client_id = $app->functions->intval($client_id);
 		
-		return $app->quota_lib->get_mailquota_data($group_id, false);
+		return $app->quota_lib->get_mailquota_data($client_id, false);
 	}
 
 }
diff --git a/interface/lib/classes/remote.d/sites.inc.php b/interface/lib/classes/remote.d/sites.inc.php
index 704a87ef8a247ea2cf2771cd15558a5d7c1e82fa..91b4523365a3dae059bcf402a1a4961baf37e4c7 100644
--- a/interface/lib/classes/remote.d/sites.inc.php
+++ b/interface/lib/classes/remote.d/sites.inc.php
@@ -873,7 +873,7 @@ class remoting_sites extends remoting {
 	}
 
 	//** quota functions -----------------------------------------------------------------------------------
-	public function quota_get_by_user($session_id, $group_id)
+	public function quota_get_by_user($session_id, $client_id)
 	{
 		global $app;
 		$app->uses('quota_lib');
@@ -882,9 +882,9 @@ class remoting_sites extends remoting {
 			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
 		}
-		$group_id = $app->functions->intval($group_id);
+		$client_id = $app->functions->intval($client_id);
 	
-		return $app->quota_lib->get_quota_data($group_id, false);
+		return $app->quota_lib->get_quota_data($client_id, false);
 	}
 	
 	
diff --git a/interface/web/dashboard/dashlets/mailquota.php b/interface/web/dashboard/dashlets/mailquota.php
index e0f6be29dfc2c0b0f479f94c5173068e23d05894..27b8333775d9989af87f255fed8b7c727e77fb1e 100644
--- a/interface/web/dashboard/dashlets/mailquota.php
+++ b/interface/web/dashboard/dashlets/mailquota.php
@@ -16,7 +16,7 @@ class dashlet_mailquota {
 		if(is_file($lng_file)) include $lng_file;
 		$tpl->setVar($wb);
 
-		$emails = $app->quota_lib->get_mailquota_data( ($_SESSION["s"]["user"]["typ"] != 'admin') ? $_SESSION['s']['user']['default_group'] : null);
+		$emails = $app->quota_lib->get_mailquota_data( ($_SESSION["s"]["user"]["typ"] != 'admin') ? $_SESSION['s']['user']['client_id'] : null);
 		//print_r($emails);
 
 		$has_mailquota = false;
diff --git a/interface/web/dashboard/dashlets/quota.php b/interface/web/dashboard/dashlets/quota.php
index 589de7173807761454adfecd4a17f808d29ca5a1..a72e1fd23772c692923083a45943695094f07955 100644
--- a/interface/web/dashboard/dashlets/quota.php
+++ b/interface/web/dashboard/dashlets/quota.php
@@ -16,7 +16,7 @@ class dashlet_quota {
 		if(is_file($lng_file)) include $lng_file;
 		$tpl->setVar($wb);
 
-		$sites = $app->quota_lib->get_quota_data( ($_SESSION["s"]["user"]["typ"] != 'admin') ? $_SESSION['s']['user']['default_group'] : null);
+		$sites = $app->quota_lib->get_quota_data( ($_SESSION["s"]["user"]["typ"] != 'admin') ? $_SESSION['s']['user']['client_id'] : null);
 		//print_r($sites);
 
 		$has_quota = false;