diff --git a/interface/web/dashboard/dashlets/limits.php b/interface/web/dashboard/dashlets/limits.php
index 95e85fd02f7b20b9ab25c47f68d8c8e1f8af3585..c2abb1c65a857117e3fe4bbdb3478533397b4049 100644
--- a/interface/web/dashboard/dashlets/limits.php
+++ b/interface/web/dashboard/dashlets/limits.php
@@ -111,29 +111,34 @@ class dashlet_limits {
 		$tpl->setVar($wb);
 		
 		if($app->auth->is_admin()) {
-			$user_is_admin = 1;
+			$user_is_admin = true;
 		} else {
-			$user_is_admin = 0;
+			$user_is_admin = false;
 		}
 		$tpl->setVar('is_admin',$user_is_admin);
 		
-		if($user_is_admin == 0) {
+		if($user_is_admin == false) {
 			$client_group_id = $_SESSION["s"]["user"]["default_group"];
 			$client = $app->db->queryOneRecord("SELECT * FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
-			
-			$rows = array();
-			foreach($limits as $limit) {
-				$field = $limit['field'];
-				if($client[$field] != 0) {
-					$value = ($client[$field] == '-1')?$wb['unlimited_txt']:$client[$field];
-					$rows[] = array('field' => $field,
-									'field_txt' => $wb[$field.'_txt'],
-									'value' => $value,
-									'usage' => $this->_get_limit_usage($limit));
-				}
+		}
+		
+		$rows = array();
+		foreach($limits as $limit) {
+			$field = $limit['field'];
+			if($user_is_admin) {
+				$value = $wb['unlimited_txt'];
+			} else {
+				$value = $client[$field];
+			}
+			if($value != 0 || $value == $wb['unlimited_txt']) {
+				$value_formatted = ($value == '-1')?$wb['unlimited_txt']:$value;
+				$rows[] = array('field' => $field,
+								'field_txt' => $wb[$field.'_txt'],
+								'value' => $value_formatted,
+								'usage' => $this->_get_limit_usage($limit));
 			}
-			$tpl->setLoop('rows',$rows);
 		}
+		$tpl->setLoop('rows',$rows);
 		
 		
 		return $tpl->grab();
diff --git a/interface/web/dashboard/dashlets/templates/limits.htm b/interface/web/dashboard/dashlets/templates/limits.htm
index 9a10abd786546aca0a79478b818b972095d35743..11fe0bbe6a9a5d2571dab430ec8d8ae9e472dd88 100644
--- a/interface/web/dashboard/dashlets/templates/limits.htm
+++ b/interface/web/dashboard/dashlets/templates/limits.htm
@@ -4,7 +4,7 @@
 	<tmpl_loop name='rows'>
 		<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
 		  <td>{tmpl_var name='field_txt'}</td>
-		  <td>{tmpl_var name='usage'} {tmpl_var name='of_txt'} {tmpl_var name='value'}</td>
+		  <td style="white-space: nowrap">{tmpl_var name='usage'} {tmpl_var name='of_txt'} {tmpl_var name='value'}</td>
 		</tr>
 	</tmpl_loop>
 	</table>