diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 4307770406c..31086e60b0c 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -1398,6 +1398,15 @@ label.quota.description=Quota Description
 label.quota.configuration=Quota Configuration
 label.quota.configure=Configure Quota
 label.quota.remove=Remove Quota
+label.quota.totalusage=Total Usage
+label.quota.balance=Balance
+label.quota.summary=Summary
+label.quota.tariff=Tariff
+label.quota.state=State
+label.quota.email.template=Email Template
+label.quota.statement=Statement
+label.quota.statement.balance=Balance
+label.quota.statement.tariff=Quota Tariff
 label.destroy.vm.graceperiod=Destroy VM Grace Period
 label.SNMP.community=SNMP Community
 label.SNMP.port=SNMP Port
diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java b/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java
index 2ef2ccf1ab3..86fad9acff2 100644
--- a/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java
+++ b/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java
@@ -20,7 +20,6 @@ import com.cloud.domain.DomainVO;
 import com.cloud.domain.dao.DomainDao;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.user.Account;
-import com.cloud.user.Account.State;
 import com.cloud.user.AccountVO;
 import com.cloud.user.User;
 import com.cloud.user.dao.AccountDao;
@@ -130,7 +129,7 @@ public class QuotaResponseBuilderImpl implements QuotaResponseBuilder {
             qr.setDomainName(domain.getName());
             qr.setBalance(curBalance);
             qr.setQuotaUsage(quotaUsage);
-            qr.setState(account.getState().compareTo(State.enabled) == 0);
+            qr.setState(account.getState());
             qr.setCurrency(QuotaConfig.QuotaCurrencySymbol.value());
             qr.setObjectName("summary");
             result.add(qr);
diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaSummaryResponse.java b/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaSummaryResponse.java
index 8c5e53a8ac9..f938a2a32de 100644
--- a/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaSummaryResponse.java
+++ b/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaSummaryResponse.java
@@ -25,6 +25,7 @@ import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
 
 import com.cloud.serializer.Param;
+import com.cloud.user.Account.State;
 
 public class QuotaSummaryResponse extends BaseResponse {
 
@@ -50,7 +51,7 @@ public class QuotaSummaryResponse extends BaseResponse {
 
     @SerializedName("state")
     @Param(description = "account state")
-    private Boolean state;
+    private State state;
 
     @SerializedName("quota")
     @Param(description = "quota usage of this period")
@@ -108,11 +109,11 @@ public class QuotaSummaryResponse extends BaseResponse {
         return quotaUsage;
     }
 
-    public Boolean getState() {
+    public State getState() {
         return state;
     }
 
-    public void setState(Boolean state) {
+    public void setState(State state) {
         this.state = state;
     }
 
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index 418fcc6deb3..c0b48122cb1 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -1024,6 +1024,15 @@ dictionary = {
 'label.quota.configuration': '<fmt:message key="label.quota.configuration" />',
 'label.quota.configure': '<fmt:message key="label.quota.configure" />',
 'label.quota.remove': '<fmt:message key="label.quota.remove" />',
+'label.quota.totalusage': '<fmt:message key="label.quota.totalusage" />',
+'label.quota.balance': '<fmt:message key="label.quota.balance" />',
+'label.quota.summary': '<fmt:message key="label.quota.summary" />',
+'label.quota.tariff': '<fmt:message key="label.quota.tariff" />',
+'label.quota.state': '<fmt:message key="label.quota.state" />',
+'label.quota.email.template': '<fmt:message key="label.quota.email.template" />',
+'label.quota.statement': '<fmt:message key="label.quota.statement" />',
+'label.quota.statement.balance': '<fmt:message key="label.quota.statement.balance" />',
+'label.quota.statement.tariff': '<fmt:message key="label.quota.statement.tariff" />',
 'label.rbd': '<fmt:message key="label.rbd" />',
 'label.rbd.monitor': '<fmt:message key="label.rbd.monitor" />',
 'label.rbd.pool': '<fmt:message key="label.rbd.pool" />',
diff --git a/ui/plugins/quota/quota.js b/ui/plugins/quota/quota.js
index 70bf49ebf0f..52496fa6598 100644
--- a/ui/plugins/quota/quota.js
+++ b/ui/plugins/quota/quota.js
@@ -52,8 +52,9 @@
                           state: {
                               label: 'label.quota.state',
                               indicator: {
-                                  'Enabled': 'on',
-                                  'Disabled': 'off',
+                                  'enabled': 'on',
+                                  'disabled': 'off',
+                                  'locked': 'off',
                               }
                           },
                       },
@@ -78,12 +79,6 @@
                                   $.each(items, function(idx, item) {
                                       items[idx].quota = items[idx].currency + ' ' + items[idx].quota;
                                       items[idx].balance = items[idx].currency + ' ' + items[idx].balance;
-                                      // FIXME: state is boolean, this needs to be string?
-                                      if (items[idx].state) {
-                                          items[idx].state = 'Enabled';
-                                      } else {
-                                          items[idx].state = 'Disabled';
-                                      }
                                   });
                                   args.response.success({
                                       data: items