diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant-profile.component.html b/ui-ngx/src/app/modules/home/components/profile/tenant-profile.component.html
index e5a3a54293..18dd97fac4 100644
--- a/ui-ngx/src/app/modules/home/components/profile/tenant-profile.component.html
+++ b/ui-ngx/src/app/modules/home/components/profile/tenant-profile.component.html
@@ -62,14 +62,14 @@
           <div class="tb-hint">{{'tenant.isolated-tb-rule-engine-details' | translate}}</div>
         </mat-checkbox>
       </div>
-      <tb-tenant-profile-data
-        formControlName="profileData"
-        required>
-      </tb-tenant-profile-data>
       <mat-form-field class="mat-block">
         <mat-label translate>tenant-profile.description</mat-label>
         <textarea matInput formControlName="description" rows="2"></textarea>
       </mat-form-field>
+      <tb-tenant-profile-data
+        formControlName="profileData"
+        required>
+      </tb-tenant-profile-data>
     </fieldset>
   </form>
 </div>
diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html b/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html
index 2a975479bd..9ea904d820 100644
--- a/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html
+++ b/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html
@@ -15,87 +15,81 @@
     limitations under the License.
 
 -->
-<section [formGroup]="defaultTenantProfileConfigurationFormGroup" fxLayout="column" fxLayoutGap="20px">
-  <mat-accordion [multi]="true">
-    <mat-expansion-panel>
-      <mat-expansion-panel-header>
-        Thingsboard rate limits
-      </mat-expansion-panel-header>
-      <ng-template matExpansionPanelContent>
-      <mat-form-field class="mat-block">
-        <mat-label translate>tenant-profile.maximum-devices</mat-label>
-        <input matInput required min="0" step="1"
-               formControlName="maxDevices"
-               type="number">
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxDevices').hasError('required')">
-          {{ 'tenant-profile.maximum-devices-required' | translate}}
-        </mat-error>
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxDevices').hasError('min')">
-          {{ 'tenant-profile.maximum-devices-range' | translate}}
-        </mat-error>
-      </mat-form-field>
-      <mat-form-field class="mat-block">
-        <mat-label translate>tenant-profile.maximum-assets</mat-label>
-        <input matInput required min="0" step="1"
-               formControlName="maxAssets"
-               type="number">
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxAssets').hasError('required')">
-          {{ 'tenant-profile.maximum-assets-required' | translate}}
-        </mat-error>
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxAssets').hasError('min')">
-          {{ 'tenant-profile.maximum-assets-range' | translate}}
-        </mat-error>
-      </mat-form-field>
-      <mat-form-field class="mat-block">
-        <mat-label translate>tenant-profile.maximum-customers</mat-label>
-        <input matInput required min="0" step="1"
-               formControlName="maxCustomers"
-               type="number">
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxCustomers').hasError('required')">
-          {{ 'tenant-profile.maximum-customers-required' | translate}}
-        </mat-error>
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxCustomers').hasError('min')">
-          {{ 'tenant-profile.maximum-customers-range' | translate}}
-        </mat-error>
-      </mat-form-field>
-      <mat-form-field class="mat-block">
-        <mat-label translate>tenant-profile.maximum-users</mat-label>
-        <input matInput required min="0" step="1"
-               formControlName="maxUsers"
-               type="number">
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxUsers').hasError('required')">
-          {{ 'tenant-profile.maximum-users-required' | translate}}
-        </mat-error>
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxUsers').hasError('min')">
-          {{ 'tenant-profile.maximum-users-range' | translate}}
-        </mat-error>
-      </mat-form-field>
-      <mat-form-field class="mat-block">
-        <mat-label translate>tenant-profile.maximum-dashboards</mat-label>
-        <input matInput required min="0" step="1"
-               formControlName="maxDashboards"
-               type="number">
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxDashboards').hasError('required')">
-          {{ 'tenant-profile.maximum-dashboards-required' | translate}}
-        </mat-error>
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxDashboards').hasError('min')">
-          {{ 'tenant-profile.maximum-dashboards-range' | translate}}
-        </mat-error>
-      </mat-form-field>
-      <mat-form-field class="mat-block">
-        <mat-label translate>tenant-profile.maximum-rule-chains</mat-label>
-        <input matInput required min="0" step="1"
-               formControlName="maxRuleChains"
-               type="number">
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxRuleChains').hasError('required')">
-          {{ 'tenant-profile.maximum-rule-chains-required' | translate}}
-        </mat-error>
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxRuleChains').hasError('min')">
-          {{ 'tenant-profile.maximum-rule-chains-range' | translate}}
-        </mat-error>
-      </mat-form-field>
-      <mat-form-field class="mat-block">
-        <mat-label translate>tenant-profile.maximum-resources-sum-data-size</mat-label>
+<section [formGroup]="defaultTenantProfileConfigurationFormGroup" fxLayout="column">
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.maximum-devices</mat-label>
+    <input matInput required min="0" step="1"
+           formControlName="maxDevices"
+           type="number">
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxDevices').hasError('required')">
+      {{ 'tenant-profile.maximum-devices-required' | translate}}
+    </mat-error>
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxDevices').hasError('min')">
+      {{ 'tenant-profile.maximum-devices-range' | translate}}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.maximum-assets</mat-label>
+    <input matInput required min="0" step="1"
+           formControlName="maxAssets"
+           type="number">
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxAssets').hasError('required')">
+      {{ 'tenant-profile.maximum-assets-required' | translate}}
+    </mat-error>
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxAssets').hasError('min')">
+      {{ 'tenant-profile.maximum-assets-range' | translate}}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.maximum-customers</mat-label>
+    <input matInput required min="0" step="1"
+           formControlName="maxCustomers"
+           type="number">
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxCustomers').hasError('required')">
+      {{ 'tenant-profile.maximum-customers-required' | translate}}
+    </mat-error>
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxCustomers').hasError('min')">
+      {{ 'tenant-profile.maximum-customers-range' | translate}}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.maximum-users</mat-label>
+    <input matInput required min="0" step="1"
+           formControlName="maxUsers"
+           type="number">
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxUsers').hasError('required')">
+      {{ 'tenant-profile.maximum-users-required' | translate}}
+    </mat-error>
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxUsers').hasError('min')">
+      {{ 'tenant-profile.maximum-users-range' | translate}}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.maximum-dashboards</mat-label>
+    <input matInput required min="0" step="1"
+           formControlName="maxDashboards"
+           type="number">
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxDashboards').hasError('required')">
+      {{ 'tenant-profile.maximum-dashboards-required' | translate}}
+    </mat-error>
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxDashboards').hasError('min')">
+      {{ 'tenant-profile.maximum-dashboards-range' | translate}}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.maximum-rule-chains</mat-label>
+    <input matInput required min="0" step="1"
+           formControlName="maxRuleChains"
+           type="number">
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxRuleChains').hasError('required')">
+      {{ 'tenant-profile.maximum-rule-chains-required' | translate}}
+    </mat-error>
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxRuleChains').hasError('min')">
+      {{ 'tenant-profile.maximum-rule-chains-range' | translate}}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.maximum-resources-sum-data-size</mat-label>
     <input matInput required min="0" step="1"
            formControlName="maxResourcesInBytes"
            type="number">
@@ -120,74 +114,74 @@
   </mat-form-field>
   <mat-form-field class="mat-block">
     <mat-label translate>tenant-profile.max-transport-messages</mat-label>
-        <input matInput required min="0" step="1"
-               formControlName="maxTransportMessages"
-               type="number">
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxTransportMessages').hasError('required')">
-          {{ 'tenant-profile.max-transport-messages-range' | translate}}
-        </mat-error>
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxTransportMessages').hasError('min')">
-          {{ 'tenant-profile.max-transport-messages-required' | translate}}
-        </mat-error>
-      </mat-form-field>
-      <mat-form-field class="mat-block">
-        <mat-label translate>tenant-profile.max-transport-data-points</mat-label>
-        <input matInput required min="0" step="1"
-               formControlName="maxTransportDataPoints"
-               type="number">
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxTransportDataPoints').hasError('required')">
-          {{ 'tenant-profile.max-transport-data-points-required' | translate}}
-        </mat-error>
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxTransportDataPoints').hasError('min')">
-          {{ 'tenant-profile.max-transport-data-points-range' | translate}}
-        </mat-error>
-      </mat-form-field>
-      <mat-form-field class="mat-block">
-        <mat-label translate>tenant-profile.max-r-e-executions</mat-label>
-        <input matInput required min="0" step="1"
-               formControlName="maxREExecutions"
-               type="number">
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxREExecutions').hasError('required')">
-          {{ 'tenant-profile.max-r-e-executions-required' | translate}}
-        </mat-error>
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxREExecutions').hasError('min')">
-          {{ 'tenant-profile.max-r-e-executions-range' | translate}}
-        </mat-error>
-      </mat-form-field>
-      <mat-form-field class="mat-block">
-        <mat-label translate>tenant-profile.max-j-s-executions</mat-label>
-        <input matInput required min="0" step="1"
-               formControlName="maxJSExecutions"
-               type="number">
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxJSExecutions').hasError('required')">
-          {{ 'tenant-profile.max-j-s-executions-required' | translate}}
-        </mat-error>
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxJSExecutions').hasError('min')">
-          {{ 'tenant-profile.max-j-s-executions-range' | translate}}
-        </mat-error>
-      </mat-form-field>
-      <mat-form-field class="mat-block">
-        <mat-label translate>tenant-profile.max-d-p-storage-days</mat-label>
-        <input matInput required min="0" step="1"
-               formControlName="maxDPStorageDays"
-               type="number">
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxDPStorageDays').hasError('required')">
-          {{ 'tenant-profile.max-d-p-storage-days-required' | translate}}
-        </mat-error>
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxDPStorageDays').hasError('min')">
-          {{ 'tenant-profile.max-d-p-storage-days-range' | translate}}
-        </mat-error>
-      </mat-form-field>
-      <mat-form-field class="mat-block">
-        <mat-label translate>tenant-profile.default-storage-ttl-days</mat-label>
-        <input matInput required min="0" step="1"
-               formControlName="defaultStorageTtlDays"
-               type="number">
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('defaultStorageTtlDays').hasError('required')">
-          {{ 'tenant-profile.default-storage-ttl-days-required' | translate}}
-        </mat-error>
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('defaultStorageTtlDays').hasError('min')">
-          {{ 'tenant-profile.default-storage-ttl-days-range' | translate}}
+    <input matInput required min="0" step="1"
+           formControlName="maxTransportMessages"
+           type="number">
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxTransportMessages').hasError('required')">
+      {{ 'tenant-profile.max-transport-messages-range' | translate}}
+    </mat-error>
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxTransportMessages').hasError('min')">
+      {{ 'tenant-profile.max-transport-messages-required' | translate}}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.max-transport-data-points</mat-label>
+    <input matInput required min="0" step="1"
+           formControlName="maxTransportDataPoints"
+           type="number">
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxTransportDataPoints').hasError('required')">
+      {{ 'tenant-profile.max-transport-data-points-required' | translate}}
+    </mat-error>
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxTransportDataPoints').hasError('min')">
+      {{ 'tenant-profile.max-transport-data-points-range' | translate}}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.max-r-e-executions</mat-label>
+    <input matInput required min="0" step="1"
+           formControlName="maxREExecutions"
+           type="number">
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxREExecutions').hasError('required')">
+      {{ 'tenant-profile.max-r-e-executions-required' | translate}}
+    </mat-error>
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxREExecutions').hasError('min')">
+      {{ 'tenant-profile.max-r-e-executions-range' | translate}}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.max-j-s-executions</mat-label>
+    <input matInput required min="0" step="1"
+           formControlName="maxJSExecutions"
+           type="number">
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxJSExecutions').hasError('required')">
+      {{ 'tenant-profile.max-j-s-executions-required' | translate}}
+    </mat-error>
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxJSExecutions').hasError('min')">
+      {{ 'tenant-profile.max-j-s-executions-range' | translate}}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.max-d-p-storage-days</mat-label>
+    <input matInput required min="0" step="1"
+           formControlName="maxDPStorageDays"
+           type="number">
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxDPStorageDays').hasError('required')">
+      {{ 'tenant-profile.max-d-p-storage-days-required' | translate}}
+    </mat-error>
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxDPStorageDays').hasError('min')">
+      {{ 'tenant-profile.max-d-p-storage-days-range' | translate}}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.default-storage-ttl-days</mat-label>
+    <input matInput required min="0" step="1"
+           formControlName="defaultStorageTtlDays"
+           type="number">
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('defaultStorageTtlDays').hasError('required')">
+      {{ 'tenant-profile.default-storage-ttl-days-required' | translate}}
+    </mat-error>
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('defaultStorageTtlDays').hasError('min')">
+      {{ 'tenant-profile.default-storage-ttl-days-range' | translate}}
     </mat-error>
   </mat-form-field>
   <mat-form-field class="mat-block">
@@ -212,222 +206,205 @@
     </mat-error>
     <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('rpcTtlDays').hasError('min')">
       {{ 'tenant-profile.rpc-ttl-days-days-range' | translate}}
-        </mat-error>
-      </mat-form-field>
-      <mat-form-field class="mat-block">
-        <mat-label translate>tenant-profile.max-rule-node-executions-per-message</mat-label>
-        <input matInput required min="0" step="1"
-               formControlName="maxRuleNodeExecutionsPerMessage"
-               type="number">
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxRuleNodeExecutionsPerMessage').hasError('required')">
-          {{ 'tenant-profile.max-rule-node-executions-per-message-required' | translate}}
-        </mat-error>
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxRuleNodeExecutionsPerMessage').hasError('min')">
-          {{ 'tenant-profile.max-rule-node-executions-per-message-range' | translate}}
-        </mat-error>
-      </mat-form-field>
-      <mat-form-field class="mat-block">
-        <mat-label translate>tenant-profile.max-emails</mat-label>
-        <input matInput required min="0" step="1"
-               formControlName="maxEmails"
-               type="number">
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxEmails').hasError('required')">
-          {{ 'tenant-profile.max-emails-required' | translate}}
-        </mat-error>
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxEmails').hasError('min')">
-          {{ 'tenant-profile.max-emails-range' | translate}}
-        </mat-error>
-      </mat-form-field>
-      <mat-form-field class="mat-block">
-        <mat-label translate>tenant-profile.max-sms</mat-label>
-        <input matInput required min="0" step="1"
-               formControlName="maxSms"
-               type="number">
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxSms').hasError('required')">
-          {{ 'tenant-profile.max-sms-required' | translate}}
-        </mat-error>
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxSms').hasError('min')">
-          {{ 'tenant-profile.max-sms-range' | translate}}
-        </mat-error>
-      </mat-form-field>
-      <mat-form-field class="mat-block">
-        <mat-label translate>tenant-profile.max-created-alarms</mat-label>
-        <input matInput required min="0" step="1"
-               formControlName="maxCreatedAlarms"
-               type="number">
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxCreatedAlarms').hasError('required')">
-          {{ 'tenant-profile.max-created-alarms-required' | translate}}
-        </mat-error>
-        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxCreatedAlarms').hasError('min')">
-          {{ 'tenant-profile.max-created-alarms-range' | translate}}
-        </mat-error>
-      </mat-form-field>
-      </ng-template>
-    </mat-expansion-panel>
-
-    <mat-expansion-panel>
-      <mat-expansion-panel-header>
-        Server rate limits
-      </mat-expansion-panel-header>
-      <ng-template matExpansionPanelContent>
-        <mat-form-field class="mat-block">
-          <mat-label translate>tenant-profile.tenant-rest-limits</mat-label>
-          <input matInput
-                 formControlName="rateLimitsTenantConfiguration"
-                 type="text">
-          <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('rateLimitsTenantConfiguration').hasError('pattern')">
-            {{ 'tenant-profile.incorrect-pattern-for-rate-limits' | translate}}
-          </mat-error>
-        </mat-form-field>
-        <mat-form-field class="mat-block">
-          <mat-label translate>tenant-profile.customer-rest-limits</mat-label>
-          <input matInput
-                 formControlName="rateLimitsCustomerConfiguration"
-                 type="text">
-          <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('rateLimitsCustomerConfiguration').hasError('pattern')">
-            {{ 'tenant-profile.incorrect-pattern-for-rate-limits' | translate}}
-          </mat-error>
-        </mat-form-field>
-      </ng-template>
-    </mat-expansion-panel>
-
-    <mat-expansion-panel>
-      <mat-expansion-panel-header>
-        Transport rate limits
-      </mat-expansion-panel-header>
-      <ng-template matExpansionPanelContent>
-        <mat-form-field class="mat-block">
-          <mat-label translate>tenant-profile.transport-tenant-msg-rate-limit</mat-label>
-          <input matInput formControlName="transportTenantMsgRateLimit">
-          <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('transportTenantMsgRateLimit').hasError('pattern')">
-            {{ 'tenant-profile.incorrect-pattern-for-rate-limits' | translate}}
-          </mat-error>
-        </mat-form-field>
-        <mat-form-field class="mat-block">
-          <mat-label translate>tenant-profile.transport-tenant-telemetry-msg-rate-limit</mat-label>
-          <input matInput formControlName="transportTenantTelemetryMsgRateLimit">
-          <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('transportTenantTelemetryMsgRateLimit').hasError('pattern')">
-            {{ 'tenant-profile.incorrect-pattern-for-rate-limits' | translate}}
-          </mat-error>
-        </mat-form-field>
-        <mat-form-field class="mat-block">
-          <mat-label translate>tenant-profile.transport-tenant-telemetry-data-points-rate-limit</mat-label>
-          <input matInput formControlName="transportTenantTelemetryDataPointsRateLimit">
-          <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('transportTenantTelemetryDataPointsRateLimit').hasError('pattern')">
-            {{ 'tenant-profile.incorrect-pattern-for-rate-limits' | translate}}
-          </mat-error>
-        </mat-form-field>
-        <mat-form-field class="mat-block">
-          <mat-label translate>tenant-profile.transport-device-msg-rate-limit</mat-label>
-          <input matInput formControlName="transportDeviceMsgRateLimit">
-          <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('transportDeviceMsgRateLimit').hasError('pattern')">
-            {{ 'tenant-profile.incorrect-pattern-for-rate-limits' | translate}}
-          </mat-error>
-        </mat-form-field>
-        <mat-form-field class="mat-block">
-          <mat-label translate>tenant-profile.transport-device-telemetry-msg-rate-limit</mat-label>
-          <input matInput formControlName="transportDeviceTelemetryMsgRateLimit">
-          <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('transportDeviceTelemetryMsgRateLimit').hasError('pattern')">
-            {{ 'tenant-profile.incorrect-pattern-for-rate-limits' | translate}}
-          </mat-error>
-        </mat-form-field>
-        <mat-form-field class="mat-block">
-          <mat-label translate>tenant-profile.transport-device-telemetry-data-points-rate-limit</mat-label>
-          <input matInput formControlName="transportDeviceTelemetryDataPointsRateLimit">
-          <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('transportDeviceTelemetryDataPointsRateLimit').hasError('pattern')">
-            {{ 'tenant-profile.incorrect-pattern-for-rate-limits' | translate}}
-          </mat-error>
-        </mat-form-field>
-      </ng-template>
-    </mat-expansion-panel>
-
-    <mat-expansion-panel>
-      <mat-expansion-panel-header>
-        Web Socket rate limits
-      </mat-expansion-panel-header>
-      <ng-template matExpansionPanelContent>
-        <mat-form-field class="mat-block">
-          <mat-label translate>tenant-profile.ws-limit-max-sessions-per-tenant</mat-label>
-          <input matInput type="number" formControlName="wsLimitMaxSessionsPerTenant">
-          <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('wsLimitMaxSessionsPerTenant').hasError('min')">
-            {{ 'tenant-profile.too-small-value-zero' | translate}}
-          </mat-error>
-        </mat-form-field>
-        <mat-form-field class="mat-block">
-          <mat-label translate>tenant-profile.ws-limit-max-sessions-per-customer</mat-label>
-          <input matInput type="number" formControlName="wsLimitMaxSessionsPerCustomer">
-          <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('wsLimitMaxSessionsPerCustomer').hasError('min')">
-            {{ 'tenant-profile.too-small-value-zero' | translate}}
-          </mat-error>
-        </mat-form-field>
-        <mat-form-field class="mat-block">
-          <mat-label translate>tenant-profile.ws-limit-max-sessions-per-public-user</mat-label>
-          <input matInput type="number" formControlName="wsLimitMaxSessionsPerPublicUser">
-          <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('wsLimitMaxSessionsPerPublicUser').hasError('min')">
-            {{ 'tenant-profile.too-small-value-zero' | translate}}
-          </mat-error>
-        </mat-form-field>
-        <mat-form-field class="mat-block">
-          <mat-label translate>tenant-profile.ws-limit-queue-per-session</mat-label>
-          <input matInput type="number" formControlName="wsLimitQueuePerWsSession">
-          <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('wsLimitQueuePerWsSession').hasError('min')">
-            {{ 'tenant-profile.too-small-value-one' | translate}}
-          </mat-error>
-        </mat-form-field>
-        <mat-form-field class="mat-block">
-          <mat-label translate>tenant-profile.ws-limit-max-subscriptions-per-tenant</mat-label>
-          <input matInput type="number" formControlName="wsLimitMaxSubscriptionsPerTenant">
-          <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('wsLimitMaxSubscriptionsPerTenant').hasError('min')">
-            {{ 'tenant-profile.too-small-value-zero' | translate}}
-          </mat-error>
-        </mat-form-field>
-        <mat-form-field class="mat-block">
-          <mat-label translate>tenant-profile.ws-limit-max-subscriptions-per-customer</mat-label>
-          <input matInput type="number" formControlName="wsLimitMaxSubscriptionsPerCustomer">
-          <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('wsLimitMaxSubscriptionsPerCustomer').hasError('min')">
-            {{ 'tenant-profile.too-small-value-zero' | translate}}
-          </mat-error>
-        </mat-form-field>
-        <mat-form-field class="mat-block">
-          <mat-label translate>tenant-profile.ws-limit-max-subscriptions-per-regular-user</mat-label>
-          <input matInput type="number" formControlName="wsLimitMaxSubscriptionsPerRegularUser">
-          <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('wsLimitMaxSubscriptionsPerRegularUser').hasError('min')">
-            {{ 'tenant-profile.too-small-value-zero' | translate}}
-          </mat-error>
-        </mat-form-field>
-        <mat-form-field class="mat-block">
-          <mat-label translate>tenant-profile.ws-limit-max-subscriptions-per-public-user</mat-label>
-          <input matInput type="number" formControlName="wsLimitMaxSubscriptionsPerPublicUser">
-          <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('wsLimitMaxSubscriptionsPerPublicUser').hasError('min')">
-            {{ 'tenant-profile.too-small-value-zero' | translate}}
-          </mat-error>
-        </mat-form-field>
-        <mat-form-field class="mat-block">
-          <mat-label translate>tenant-profile.ws-limit-updates-per-session</mat-label>
-          <input matInput type="text" formControlName="wsLimitUpdatesPerSession">
-          <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('wsLimitUpdatesPerSession').hasError('pattern')">
-            {{ 'tenant-profile.incorrect-pattern-for-rate-limits' | translate}}
-          </mat-error>
-        </mat-form-field>
-      </ng-template>
-    </mat-expansion-panel>
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.max-rule-node-executions-per-message</mat-label>
+    <input matInput required min="0" step="1"
+           formControlName="maxRuleNodeExecutionsPerMessage"
+           type="number">
+    <mat-error
+            *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxRuleNodeExecutionsPerMessage').hasError('required')">
+      {{ 'tenant-profile.max-rule-node-executions-per-message-required' | translate}}
+    </mat-error>
+    <mat-error
+            *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxRuleNodeExecutionsPerMessage').hasError('min')">
+      {{ 'tenant-profile.max-rule-node-executions-per-message-range' | translate}}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.max-emails</mat-label>
+    <input matInput required min="0" step="1"
+           formControlName="maxEmails"
+           type="number">
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxEmails').hasError('required')">
+      {{ 'tenant-profile.max-emails-required' | translate}}
+    </mat-error>
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxEmails').hasError('min')">
+      {{ 'tenant-profile.max-emails-range' | translate}}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.max-sms</mat-label>
+    <input matInput required min="0" step="1"
+           formControlName="maxSms"
+           type="number">
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxSms').hasError('required')">
+      {{ 'tenant-profile.max-sms-required' | translate}}
+    </mat-error>
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxSms').hasError('min')">
+      {{ 'tenant-profile.max-sms-range' | translate}}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.max-created-alarms</mat-label>
+    <input matInput required min="0" step="1"
+           formControlName="maxCreatedAlarms"
+           type="number">
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxCreatedAlarms').hasError('required')">
+      {{ 'tenant-profile.max-created-alarms-required' | translate}}
+    </mat-error>
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxCreatedAlarms').hasError('min')">
+      {{ 'tenant-profile.max-created-alarms-range' | translate}}
+    </mat-error>
+  </mat-form-field>
 
-    <mat-expansion-panel>
-      <mat-expansion-panel-header>
-        Cassandra rate limits
-      </mat-expansion-panel-header>
-      <ng-template matExpansionPanelContent>
-        <mat-form-field class="mat-block">
-          <mat-label translate>tenant-profile.cassandra-tenant-limits-configuration</mat-label>
-          <input matInput type="text" formControlName="cassandraTenantLimitsConfiguration">
-          <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('cassandraTenantLimitsConfiguration').hasError('pattern')">
-            {{ 'tenant-profile.incorrect-pattern-for-rate-limits' | translate}}
-          </mat-error>
-        </mat-form-field>
-        <mat-checkbox formControlName="printTenantNames">
-          {{ 'tenant-profile.cassandra-print-tenant-names' | translate }}
-        </mat-checkbox>
-      </ng-template>
-    </mat-expansion-panel>
-  </mat-accordion>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.transport-tenant-msg-rate-limit</mat-label>
+    <input matInput formControlName="transportTenantMsgRateLimit">
+    <mat-error
+            *ngIf="defaultTenantProfileConfigurationFormGroup.get('transportTenantMsgRateLimit').hasError('pattern')">
+      {{ 'tenant-profile.incorrect-pattern-for-rate-limits' | translate}}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.transport-tenant-telemetry-msg-rate-limit</mat-label>
+    <input matInput formControlName="transportTenantTelemetryMsgRateLimit">
+    <mat-error
+            *ngIf="defaultTenantProfileConfigurationFormGroup.get('transportTenantTelemetryMsgRateLimit').hasError('pattern')">
+      {{ 'tenant-profile.incorrect-pattern-for-rate-limits' | translate}}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.transport-tenant-telemetry-data-points-rate-limit</mat-label>
+    <input matInput formControlName="transportTenantTelemetryDataPointsRateLimit">
+    <mat-error
+            *ngIf="defaultTenantProfileConfigurationFormGroup.get('transportTenantTelemetryDataPointsRateLimit').hasError('pattern')">
+      {{ 'tenant-profile.incorrect-pattern-for-rate-limits' | translate}}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.transport-device-msg-rate-limit</mat-label>
+    <input matInput formControlName="transportDeviceMsgRateLimit">
+    <mat-error
+            *ngIf="defaultTenantProfileConfigurationFormGroup.get('transportDeviceMsgRateLimit').hasError('pattern')">
+      {{ 'tenant-profile.incorrect-pattern-for-rate-limits' | translate}}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.transport-device-telemetry-msg-rate-limit</mat-label>
+    <input matInput formControlName="transportDeviceTelemetryMsgRateLimit">
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.transport-device-telemetry-data-points-rate-limit</mat-label>
+    <input matInput formControlName="transportDeviceTelemetryDataPointsRateLimit">
+    <mat-error
+            *ngIf="defaultTenantProfileConfigurationFormGroup.get('transportDeviceTelemetryDataPointsRateLimit').hasError('pattern')">
+      {{ 'tenant-profile.incorrect-pattern-for-rate-limits' | translate}}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.tenant-rest-limits</mat-label>
+    <input matInput
+           formControlName="tenantServerRestLimitsConfiguration"
+           type="text">
+    <mat-error
+            *ngIf="defaultTenantProfileConfigurationFormGroup.get('tenantServerRestLimitsConfiguration').hasError('pattern')">
+      {{ 'tenant-profile.incorrect-pattern-for-rate-limits' | translate}}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.customer-rest-limits</mat-label>
+    <input matInput
+           formControlName="customerServerRestLimitsConfiguration"
+           type="text">
+    <mat-error
+            *ngIf="defaultTenantProfileConfigurationFormGroup.get('customerServerRestLimitsConfiguration').hasError('pattern')">
+      {{ 'tenant-profile.incorrect-pattern-for-rate-limits' | translate}}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.ws-limit-max-sessions-per-tenant</mat-label>
+    <input matInput type="number" formControlName="maxWsSessionsPerTenant">
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxWsSessionsPerTenant').hasError('min')">
+      {{ 'tenant-profile.too-small-value-zero' | translate}}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.ws-limit-max-sessions-per-customer</mat-label>
+    <input matInput type="number" formControlName="maxWsSessionsPerCustomer">
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxWsSessionsPerCustomer').hasError('min')">
+      {{ 'tenant-profile.too-small-value-zero' | translate}}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.ws-limit-max-sessions-per-public-user</mat-label>
+    <input matInput type="number" formControlName="maxWsSessionsPerRegularUser">
+    <mat-error
+            *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxWsSessionsPerRegularUser').hasError('min')">
+      {{ 'tenant-profile.too-small-value-zero' | translate}}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.ws-limit-max-sessions-per-public-user</mat-label>
+    <input matInput type="number" formControlName="maxWsSessionsPerPublicUser">
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxWsSessionsPerPublicUser').hasError('min')">
+      {{ 'tenant-profile.too-small-value-zero' | translate}}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.ws-limit-queue-per-session</mat-label>
+    <input matInput type="number" formControlName="wsMsgQueueLimitPerSession">
+    <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('wsMsgQueueLimitPerSession').hasError('min')">
+      {{ 'tenant-profile.too-small-value-one' | translate}}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.ws-limit-max-subscriptions-per-tenant</mat-label>
+    <input matInput type="number" formControlName="maxWsSubscriptionsPerTenant">
+    <mat-error
+            *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxWsSubscriptionsPerTenant').hasError('min')">
+      {{ 'tenant-profile.too-small-value-zero' | translate}}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.ws-limit-max-subscriptions-per-customer</mat-label>
+    <input matInput type="number" formControlName="maxWsSubscriptionsPerCustomer">
+    <mat-error
+            *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxWsSubscriptionsPerCustomer').hasError('min')">
+      {{ 'tenant-profile.too-small-value-zero' | translate}}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.ws-limit-max-subscriptions-per-regular-user</mat-label>
+    <input matInput type="number" formControlName="maxWsSubscriptionsPerRegularUser">
+    <mat-error
+            *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxWsSubscriptionsPerRegularUser').hasError('min')">
+      {{ 'tenant-profile.too-small-value-zero' | translate}}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.ws-limit-max-subscriptions-per-public-user</mat-label>
+    <input matInput type="number" formControlName="maxWsSubscriptionsPerPublicUser">
+    <mat-error
+            *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxWsSubscriptionsPerPublicUser').hasError('min')">
+      {{ 'tenant-profile.too-small-value-zero' | translate}}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.ws-limit-updates-per-session</mat-label>
+    <input matInput type="text" formControlName="wsUpdatesPerSessionRateLimit">
+    <mat-error
+            *ngIf="defaultTenantProfileConfigurationFormGroup.get('wsUpdatesPerSessionRateLimit').hasError('pattern')">
+      {{ 'tenant-profile.incorrect-pattern-for-rate-limits' | translate}}
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field class="mat-block">
+    <mat-label translate>tenant-profile.cassandra-tenant-limits-configuration</mat-label>
+    <input matInput type="text" formControlName="cassandraQueryTenantRateLimitsConfiguration">
+    <mat-error
+            *ngIf="defaultTenantProfileConfigurationFormGroup.get('cassandraQueryTenantRateLimitsConfiguration').hasError('pattern')">
+      {{ 'tenant-profile.incorrect-pattern-for-rate-limits' | translate}}
+    </mat-error>
+  </mat-form-field>
 </section>
diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts b/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts
index f9fe3bc3b1..8bcde9a68b 100644
--- a/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts
+++ b/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts
@@ -80,22 +80,19 @@ export class DefaultTenantProfileConfigurationComponent implements ControlValueA
       defaultStorageTtlDays: [null, [Validators.required, Validators.min(0)]],
       alarmsTtlDays: [null, [Validators.required, Validators.min(0)]],
       rpcTtlDays: [null, [Validators.required, Validators.min(0)]],
-
-      rateLimitsTenantConfiguration: [null, [Validators.pattern(this.rateLimitsPattern)]],
-      rateLimitsCustomerConfiguration: [null, [Validators.pattern(this.rateLimitsPattern)]],
-
-      wsLimitMaxSessionsPerTenant: [null, [Validators.min(0)]],
-      wsLimitMaxSessionsPerCustomer: [null, [Validators.min(0)]],
-      wsLimitMaxSessionsPerPublicUser: [null, [Validators.min(0)]],
-      wsLimitQueuePerWsSession: [null, [Validators.min(0)]],
-      wsLimitMaxSubscriptionsPerTenant: [null, [Validators.min(0)]],
-      wsLimitMaxSubscriptionsPerCustomer: [null, [Validators.min(0)]],
-      wsLimitMaxSubscriptionsPerRegularUser: [null, [Validators.min(0)]],
-      wsLimitMaxSubscriptionsPerPublicUser: [null, [Validators.min(0)]],
-      wsLimitUpdatesPerSession: [null, [Validators.pattern(this.rateLimitsPattern)]],
-
-      cassandraTenantLimitsConfiguration: [null, [Validators.pattern(this.rateLimitsPattern)]],
-      printTenantNames: [null, []]
+      tenantServerRestLimitsConfiguration: [null, [Validators.pattern(this.rateLimitsPattern)]],
+      customerServerRestLimitsConfiguration: [null, [Validators.pattern(this.rateLimitsPattern)]],
+      maxWsSessionsPerTenant: [null, [Validators.min(0)]],
+      maxWsSessionsPerCustomer: [null, [Validators.min(0)]],
+      maxWsSessionsPerRegularUser: [null, [Validators.min(0)]],
+      maxWsSessionsPerPublicUser: [null, [Validators.min(0)]],
+      wsMsgQueueLimitPerSession: [null, [Validators.min(0)]],
+      maxWsSubscriptionsPerTenant: [null, [Validators.min(0)]],
+      maxWsSubscriptionsPerCustomer: [null, [Validators.min(0)]],
+      maxWsSubscriptionsPerRegularUser: [null, [Validators.min(0)]],
+      maxWsSubscriptionsPerPublicUser: [null, [Validators.min(0)]],
+      wsUpdatesPerSessionRateLimit: [null, [Validators.pattern(this.rateLimitsPattern)]],
+      cassandraQueryTenantRateLimitsConfiguration: [null, [Validators.pattern(this.rateLimitsPattern)]]
     });
     this.defaultTenantProfileConfigurationFormGroup.valueChanges.subscribe(() => {
       this.updateModel();
diff --git a/ui-ngx/src/app/shared/models/tenant.model.ts b/ui-ngx/src/app/shared/models/tenant.model.ts
index 910e48d0a6..26b5a0aa88 100644
--- a/ui-ngx/src/app/shared/models/tenant.model.ts
+++ b/ui-ngx/src/app/shared/models/tenant.model.ts
@@ -51,22 +51,21 @@ export interface DefaultTenantProfileConfiguration {
   maxSms: number;
   maxCreatedAlarms: number;
 
-  rateLimitsTenantConfiguration: string;
-  rateLimitsCustomerConfiguration: string;
-
-  wsLimitMaxSessionsPerTenant: number;
-  wsLimitMaxSessionsPerCustomer: number;
-  wsLimitMaxSessionsPerRegularUser: number;
-  wsLimitMaxSessionsPerPublicUser: number;
-  wsLimitQueuePerWsSession: number;
-  wsLimitMaxSubscriptionsPerTenant: number;
-  wsLimitMaxSubscriptionsPerCustomer: number;
-  wsLimitMaxSubscriptionsPerRegularUser: number;
-  wsLimitMaxSubscriptionsPerPublicUser: number;
-  wsLimitUpdatesPerSession: string;
-
-  cassandraTenantLimitsConfiguration: string;
-  printTenantNames: boolean;
+  tenantServerRestLimitsConfiguration: string;
+  customerServerRestLimitsConfiguration: string;
+
+  maxWsSessionsPerTenant: number;
+  maxWsSessionsPerCustomer: number;
+  maxWsSessionsPerRegularUser: number;
+  maxWsSessionsPerPublicUser: number;
+  wsMsgQueueLimitPerSession: number;
+  maxWsSubscriptionsPerTenant: number;
+  maxWsSubscriptionsPerCustomer: number;
+  maxWsSubscriptionsPerRegularUser: number;
+  maxWsSubscriptionsPerPublicUser: number;
+  wsUpdatesPerSessionRateLimit: string;
+
+  cassandraQueryTenantRateLimitsConfiguration: string;
 
   defaultStorageTtlDays: number;
   alarmsTtlDays: number;
@@ -102,26 +101,22 @@ export function createTenantProfileConfiguration(type: TenantProfileType): Tenan
           maxEmails: 0,
           maxSms: 0,
           maxCreatedAlarms: 0,
+          tenantServerRestLimitsConfiguration: '',
+          customerServerRestLimitsConfiguration: '',
+          maxWsSessionsPerTenant: 0,
+          maxWsSessionsPerCustomer: 0,
+          maxWsSessionsPerRegularUser: 0,
+          maxWsSessionsPerPublicUser: 0,
+          wsMsgQueueLimitPerSession: 0,
+          maxWsSubscriptionsPerTenant: 0,
+          maxWsSubscriptionsPerCustomer: 0,
+          maxWsSubscriptionsPerRegularUser: 0,
+          maxWsSubscriptionsPerPublicUser: 0,
+          wsUpdatesPerSessionRateLimit: '',
+          cassandraQueryTenantRateLimitsConfiguration: '',
           defaultStorageTtlDays: 0,
           alarmsTtlDays: 0,
           rpcTtlDays: 0,
-
-          rateLimitsTenantConfiguration: '',
-          rateLimitsCustomerConfiguration: '',
-
-          wsLimitMaxSessionsPerTenant: 0,
-          wsLimitMaxSessionsPerCustomer: 0,
-          wsLimitMaxSessionsPerRegularUser: 0,
-          wsLimitMaxSessionsPerPublicUser: 0,
-          wsLimitQueuePerWsSession: 500,
-          wsLimitMaxSubscriptionsPerTenant: 0,
-          wsLimitMaxSubscriptionsPerCustomer: 0,
-          wsLimitMaxSubscriptionsPerRegularUser: 0,
-          wsLimitMaxSubscriptionsPerPublicUser: 0,
-          wsLimitUpdatesPerSession: '' ,
-
-          cassandraTenantLimitsConfiguration: '',
-          printTenantNames: false
         };
         configuration = {...defaultConfiguration, type: TenantProfileType.DEFAULT};
         break;
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index c5e49e64f0..851e8933f7 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -2814,22 +2814,21 @@
         "max-created-alarms": "Maximum number of alarms created (0 - unlimited)",
         "max-created-alarms-required": "Maximum number of alarms created is required.",
         "max-created-alarms-range": "Maximum number of alarms created can't be negative",
-        "tenant-rest-limits": "Server limits of request for Tenant",
-        "customer-rest-limits": "Server limits of request for Customer",
-        "incorrect-pattern-for-rate-limits": "Here should be conformity of a number of requests per seconds divided by colon, comma separated. For example: 100:1,2000:60",
-        "too-small-value-zero": "Too small value specified, it should be more than 0",
-        "too-small-value-one": "Too small value specified, it should be more than 1",
-        "cassandra-tenant-limits-configuration": "Tenant limits configuration",
-        "ws-limit-max-sessions-per-tenant": "Max sessions per Tenant",
-        "ws-limit-max-sessions-per-customer": "Max sessions per Customer",
-        "ws-limit-max-sessions-per-public-user": "Max sessions per Public User",
-        "ws-limit-queue-per-session": "Limit queue per session",
-        "ws-limit-max-subscriptions-per-tenant": "Max subscriptions per Tenant",
-        "ws-limit-max-subscriptions-per-customer": "Max subscriptions per Customer",
-        "ws-limit-max-subscriptions-per-regular-user": "Max subscriptions per regular User",
-        "ws-limit-max-subscriptions-per-public-user": "Max subscriptions per public User",
-        "ws-limit-updates-per-session": "Constraint of updates per session",
-        "cassandra-print-tenant-names": "Print Tenant names to log"
+        "tenant-rest-limits": "Rate limit for REST requests for tenant",
+        "customer-rest-limits": "Rate limit for REST requests for customer",
+        "incorrect-pattern-for-rate-limits": "The format is comma separated pairs of capacity and period (in seconds) with a colon between, e.g. 100:1,2000:60",
+        "too-small-value-zero": "The value must be bigger than 0",
+        "too-small-value-one": "The value must be bigger than 1",
+        "cassandra-tenant-limits-configuration": "Cassandra query rate limit for tenant",
+        "ws-limit-max-sessions-per-tenant": "Maximum number of WS sessions per tenant",
+        "ws-limit-max-sessions-per-customer": "Maximum number of WS sessions per customer",
+        "ws-limit-max-sessions-per-public-user": "Maximum number of WS sessions per public user",
+        "ws-limit-queue-per-session": "Maximum size of WS message queue per session",
+        "ws-limit-max-subscriptions-per-tenant": "Maximum number of WS subscriptions per tenant",
+        "ws-limit-max-subscriptions-per-customer": "Maximum number of WS subscriptions per customer",
+        "ws-limit-max-subscriptions-per-regular-user": "Maximum number of WS subscriptions per regular user",
+        "ws-limit-max-subscriptions-per-public-user": "Maximum number of WS subscriptions per public user",
+        "ws-limit-updates-per-session": "Rate limit for WS updates per session"
     },
     "timeinterval": {
         "seconds-interval": "{ seconds, plural, 1 {1 second} other {# seconds} }",