diff --git a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaCreditsCmd.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaCreditsCmd.java
index 19a7c47cbd6..ce8a073cf06 100644
--- a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaCreditsCmd.java
+++ b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaCreditsCmd.java
@@ -60,7 +60,7 @@ public class QuotaCreditsCmd extends BaseCmd {
 
     @ACL
     @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class,
-            description = "ID of the Project for which qQuota credits will be added. Can not be specified with '" + ApiConstants.ACCOUNT_ID + "'.")
+            description = "ID of the Project for which Quota credits will be added. Can not be specified with '" + ApiConstants.ACCOUNT_ID + "'.")
     private Long projectId;
 
     @Parameter(name = ApiConstants.VALUE, type = CommandType.DOUBLE, required = true, description = "Amount of credits to be added (in case of a positive value) or subtracted (in case of a negative value).")
diff --git a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java
index 5d6524b508a..6600d8d25a4 100644
--- a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java
+++ b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java
@@ -766,7 +766,7 @@ public class QuotaResponseBuilderImpl implements QuotaResponseBuilder {
             return;
         }
 
-        if (enforceQuota && account.getState() == Account.State.ENABLED && _quotaManager.isLockable(account)) {
+        if (Boolean.TRUE.equals(enforceQuota) && account.getState() == Account.State.ENABLED && _quotaManager.isLockable(account)) {
             logger.info("Locking Account [{}] due to negative balance.", accountName);
             _accountMgr.lockAccount(accountName, domainId, accountId);
         }
diff --git a/ui/src/components/view/ListView.vue b/ui/src/components/view/ListView.vue
index d0e499f4d23..d32d7b1476a 100644
--- a/ui/src/components/view/ListView.vue
+++ b/ui/src/components/view/ListView.vue
@@ -677,13 +677,13 @@
         <template v-if="text">
           <template v-if="!text.startsWith('PrjAcct-')">
             <router-link
-              v-if="$route.path.startsWith('/quotasummary') && $router.resolve(`${$route.path}/${record.accountid}`) !== '404'"
+              v-if="$route.path.startsWith('/quotasummary') && $router.resolve(`${$route.path}/${record.accountid}`).matched[0].redirect !== '/exception/404'"
               :to="{ path: `${$route.path}/${record.accountid}` }">{{ text }}</router-link>
             <span v-else>{{ text }}</span>
           </template>
           <template v-else>
             <router-link
-              v-if="$route.path.startsWith('/quotasummary') && $router.resolve(`${$route.path}/${record.accountid}`) !== '404'"
+              v-if="$route.path.startsWith('/quotasummary') && $router.resolve(`${$route.path}/${record.accountid}`).matched[0].redirect !== '/exception/404'"
               :to="{ path: `${$route.path}/${record.accountid}` }">{{ (record.projectname || record.account).concat(' (').concat($t('label.project')).concat(')') }}</router-link>
             <span v-else>{{ text }}</span>
           </template>
diff --git a/ui/src/utils/export.js b/ui/src/utils/export.js
index a50ead9bfaf..7619cf56e1f 100644
--- a/ui/src/utils/export.js
+++ b/ui/src/utils/export.js
@@ -34,7 +34,7 @@ export function exportDataToCsv ({ data = null, keys = null, headers = null, col
 
       if (typeof item[key] === 'string' && item[key].includes(columnDelimiter)) {
         dataParsed += `"${item[key]}"`
-      } else if (dateFormat && item[key] instanceof dayjs) {
+      } else if (dateFormat && dayjs.isDayjs(item[key])) {
         dataParsed += `"${item[key].format(dateFormat)}"`
       } else {
         dataParsed += item[key]
diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue
index 53329a508e5..1286601ec1f 100644
--- a/ui/src/views/AutogenView.vue
+++ b/ui/src/views/AutogenView.vue
@@ -1118,7 +1118,9 @@ export default {
 
       if (this.apiName === 'quotaTariffList' && !('quotaTariffCreate' in store.getters.apis || 'quotaTariffUpdate' in store.getters.apis)) {
         const index = this.columns.findIndex(col => col.dataIndex === 'hasActivationRule')
-        this.columns.splice(index, 1)
+        if (index >= 0) {
+          this.columns.splice(index, 1)
+        }
       }
 
       this.loading = true
diff --git a/ui/src/views/plugins/quota/AddQuotaCredit.vue b/ui/src/views/plugins/quota/AddQuotaCredit.vue
index 1a5f8b7dae4..854fd2b3979 100644
--- a/ui/src/views/plugins/quota/AddQuotaCredit.vue
+++ b/ui/src/views/plugins/quota/AddQuotaCredit.vue
@@ -94,16 +94,12 @@ export default {
   },
   created () {
     this.initForm()
-    console.log(store.getters.project)
-    console.log(store.getters.userInfo)
   },
   methods: {
     initForm () {
       this.formRef = ref()
       this.form = reactive({})
       this.rules = reactive({
-        domainid: [{ required: true, message: this.$t('message.action.quota.credit.add.error.domainidrequired') }],
-        accountid: [{ required: true, message: this.$t('message.action.quota.credit.add.error.accountrequired') }],
         value: [{ required: true, message: this.$t('message.action.quota.credit.add.error.valuerequired') }]
       })
     },
@@ -142,7 +138,6 @@ export default {
       this.$emit('close-action')
     },
     fetchOwnerOptions (OwnerOptions) {
-      console.log(OwnerOptions)
       this.owner = {}
       if (OwnerOptions.selectedAccountType === 'Account') {
         if (!OwnerOptions.selectedAccount) {
diff --git a/ui/src/views/plugins/quota/QuotaBalanceTab.vue b/ui/src/views/plugins/quota/QuotaBalanceTab.vue
index 3e2d2544db9..098dca6783b 100644
--- a/ui/src/views/plugins/quota/QuotaBalanceTab.vue
+++ b/ui/src/views/plugins/quota/QuotaBalanceTab.vue
@@ -121,8 +121,8 @@ export default {
     async getQuotaBalance () {
       const params = {
         accountid: this.$route.params?.id,
-        startDate: this.startDate,
-        endDate: this.endDate
+        startdate: this.startDate,
+        enddate: this.endDate
       }
 
       return await getAPI('quotaBalance', params)
diff --git a/ui/src/views/plugins/quota/QuotaCreditTab.vue b/ui/src/views/plugins/quota/QuotaCreditTab.vue
index 97b704a9d9e..72f7f3e1780 100644
--- a/ui/src/views/plugins/quota/QuotaCreditTab.vue
+++ b/ui/src/views/plugins/quota/QuotaCreditTab.vue
@@ -132,7 +132,7 @@ export default {
       }
 
       return await getAPI('quotaCreditsList', params)
-        .then(json => json.quotacreditslistresponse.credit || {})
+        .then(json => json.quotacreditslistresponse.credit || [])
         .catch(error => { error && this.$notification.info({ message: this.$t('message.request.no.data') }) })
     },
     exportDataToCsv () {
diff --git a/ui/src/views/plugins/quota/QuotaUsageTab.vue b/ui/src/views/plugins/quota/QuotaUsageTab.vue
index f0db55b335b..1f246b5902d 100644
--- a/ui/src/views/plugins/quota/QuotaUsageTab.vue
+++ b/ui/src/views/plugins/quota/QuotaUsageTab.vue
@@ -99,7 +99,6 @@
         class="w-100"
         style="margin: 5px 0 10px 0px"
         show-search
-        v-model="selectedType"
         @change="handleSelectedTypeChange">
         <a-select-option
           v-for="quotaType of getQuotaTypesFiltered()"
@@ -133,7 +132,7 @@
             <span v-if="!text">
               -
             </span>
-            <span v-if="!text === '<untraceable>' || !record.resourceid">
+            <span v-if="text === '<untraceable>' || !record.resourceid">
               {{ text }}
             </span>
             <a v-else @click="handleSelectedResourceChange(record.resourceid)">
@@ -160,7 +159,6 @@
         class="w-100"
         style="margin: 5px 0 10px 0px"
         show-search
-        v-model="selectedResource"
         @change="handleSelectedResourceChange"
         :disabled="getResources().length == 0">
         <a-select-option
@@ -339,7 +337,7 @@ export default {
         {
           title: this.$t('label.quota.consumed'),
           dataIndex: 'quotaconsumed',
-          sorter: (a, b) => a.quotaused - b.quotaused
+          sorter: (a, b) => a.quotaconsumed - b.quotaconsumed
         }
       ]
     }
@@ -554,7 +552,7 @@ export default {
     pushDateToLabelsIfNotPresent (lineChartLabels, date) {
       const hasDate = lineChartLabels.some(d => {
         const diff = Math.abs(new Date(date) - new Date(d).getTime())
-        return diff < 5 * 1000 // Do not push the label if there is already one within 5 minutes
+        return diff < 5 * 1000 * 60 // Do not push the label if there is already one within 5 minutes
       })
       if (!hasDate) {
         lineChartLabels.push(date)