diff --git a/interface/lib/classes/quota_lib.inc.php b/interface/lib/classes/quota_lib.inc.php
index b02cdea9949fb92c23451a18f49b2377a3d23d4c..063d128b66d73f9fedc23b0e893bba35ec8fbb96 100644
--- a/interface/lib/classes/quota_lib.inc.php
+++ b/interface/lib/classes/quota_lib.inc.php
@@ -326,7 +326,7 @@ class quota_lib {
 					if($used_ratio >= 0.8) $databases[$i]['display_colour'] = '#fd934f';
 					if($used_ratio >= 1) $databases[$i]['display_colour'] = '#cc0000';
 
-					if($databases[$i]['database_quota'] == 0){
+                                       if($databases[$i]['database_quota'] == -1) {
 						$databases[$i]['database_quota'] = $app->lng('unlimited_txt');
 					} else {
 						$databases[$i]['database_quota'] = $databases[$i]['database_quota'] . ' MB';
diff --git a/interface/web/dashboard/dashlets/templates/databasequota.htm b/interface/web/dashboard/dashlets/templates/databasequota.htm
index 082dd1f8c0dfdbdba890de2471098a540f34cfc1..48d6fa834cf57e841102cabb7a98beae074386ec 100644
--- a/interface/web/dashboard/dashlets/templates/databasequota.htm
+++ b/interface/web/dashboard/dashlets/templates/databasequota.htm
@@ -14,7 +14,7 @@
 			  <td>{tmpl_var name='database_name'}</td>
 			  <td>{tmpl_var name='used'}</td>
 			  <td>{tmpl_var name='database_quota'}</td>
-			  {tmpl_if name="quota_raw" op="!=" value="0"}<td>
+                         {tmpl_if name="quota_raw" op="!=" value="-1"}<td>
 			  <div class='progress'>
 				  <div class='progress-bar-striped progress-bar progress-bar-{tmpl_if name="used_percentage" op="<" value="50"}success{tmpl_elseif name="used_percentage" op="<" value="75"}warning{tmpl_else}danger{/tmpl_if}' role='progressbar' aria-valuemin='0' aria-valuemax='100' aria-valuenow='{tmpl_var name="used_percentage"}' style='width: {tmpl_var name="used_percentage"}%'><span>{tmpl_var name="used_percentage"}%</span>
 				  <span class='sr-only'>{tmpl_var name='used'} {tmpl_var name='of_txt'} {tmpl_var name='database_quota'}</span>
diff --git a/interface/web/dashboard/dashlets/templates/mailquota.htm b/interface/web/dashboard/dashlets/templates/mailquota.htm
index 9013c7ac3bc781797a3fa10fc480bcfa9c80a330..81a82f534983bf98764dbf7a81631821a8175bdf 100644
--- a/interface/web/dashboard/dashlets/templates/mailquota.htm
+++ b/interface/web/dashboard/dashlets/templates/mailquota.htm
@@ -16,7 +16,7 @@
 			  <td>{tmpl_var name='name'}</td>
 			  <td>{tmpl_var name='used'}</td>
 			  <td>{tmpl_var name='quota'}</td>
-			  {tmpl_if name="quota_raw" op="!=" value="0"}<td>
+                         {tmpl_if name="quota_raw" op="!=" value="-1"}<td>
 			  <div class='progress'>
 				  <div class='progress-bar-striped progress-bar progress-bar-{tmpl_if name="used_percentage" op="<" value="50"}success{tmpl_elseif name="used_percentage" op="<" value="75"}warning{tmpl_else}danger{/tmpl_if}' role='progressbar' aria-valuemin='0' aria-valuemax='100' aria-valuenow='{tmpl_var name="used_percentage"}' style='width:{tmpl_var name="used_percentage"}%'><span>{tmpl_var name="used_percentage"}%</span>
 				  <span class='sr-only'>{tmpl_var name='used'} {tmpl_var name='of_txt'} {tmpl_var name='quota'}</span>