diff --git a/interface/web/dashboard/dashlets/templates/databasequota.htm b/interface/web/dashboard/dashlets/templates/databasequota.htm
index 7cfd10b095a627c5e3cda2084788143ad01c8331..082dd1f8c0dfdbdba890de2471098a540f34cfc1 100644
--- a/interface/web/dashboard/dashlets/templates/databasequota.htm
+++ b/interface/web/dashboard/dashlets/templates/databasequota.htm
@@ -14,9 +14,9 @@
 			  <td>{tmpl_var name='database_name'}</td>
 			  <td>{tmpl_var name='used'}</td>
 			  <td>{tmpl_var name='database_quota'}</td>
-			  {tmpl_if name="database_quota" op="!=" value="unlimited"}<td>
+			  {tmpl_if name="quota_raw" op="!=" value="0"}<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"}%'>{tmpl_var name="used_percentage"}%
+				  <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>
 				  </div>
 			  </div>
diff --git a/interface/web/dashboard/dashlets/templates/limits.htm b/interface/web/dashboard/dashlets/templates/limits.htm
index d4144ee562fc515e1432d2017224a52f449a9999..7b462063352779a8886f9ae3df88cceee23d7756 100644
--- a/interface/web/dashboard/dashlets/templates/limits.htm
+++ b/interface/web/dashboard/dashlets/templates/limits.htm
@@ -19,7 +19,7 @@
 								role='progressbar' aria-valuemin='0' aria-valuemax='100'
 								aria-valuenow='{tmpl_var name="progressbar"}' style='width:{tmpl_var name="progressbar"}%'
 								data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='percentage'}%">
-								{tmpl_var name="percentage"}%
+								<span>{tmpl_var name="percentage"}%</span>
 								<span class='sr-only'>{tmpl_var name='usage'} {tmpl_var name='of_txt'} {tmpl_var
 									name='value'}</span>
 							</div>
diff --git a/interface/web/dashboard/dashlets/templates/mailquota.htm b/interface/web/dashboard/dashlets/templates/mailquota.htm
index d80c619feeac0d791f8ce1ed7f81666cce15a730..9013c7ac3bc781797a3fa10fc480bcfa9c80a330 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" op="!=" value="unlimited"}<td>
+			  {tmpl_if name="quota_raw" op="!=" value="0"}<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>