diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant-profile.component.ts b/ui-ngx/src/app/modules/home/components/profile/tenant-profile.component.ts
index 7cca3ae414..4e960e18a3 100644
--- a/ui-ngx/src/app/modules/home/components/profile/tenant-profile.component.ts
+++ b/ui-ngx/src/app/modules/home/components/profile/tenant-profile.component.ts
@@ -23,7 +23,7 @@ import {
   TenantProfile,
   TenantProfileData,
   TenantProfileType
-} from '@app/shared/models/tenant.model';
+} from '@shared/models/tenant.model';
 import { ActionNotificationShow } from '@app/core/notification/notification.actions';
 import { TranslateService } from '@ngx-translate/core';
 import { EntityTableConfig } from '@home/models/entity/entities-table-config.models';
@@ -73,7 +73,7 @@ export class TenantProfileComponent extends EntityComponent<TenantProfile> {
     this.entityForm.patchValue({name: entity.name});
     this.entityForm.patchValue({isolatedTbCore: entity.isolatedTbCore});
     this.entityForm.patchValue({isolatedTbRuleEngine: entity.isolatedTbRuleEngine});
-    this.entityForm.patchValue({profileData: !this.isAdd ? entity.profileData: {
+    this.entityForm.patchValue({profileData: !this.isAdd ? entity.profileData : {
         configuration: createTenantProfileConfiguration(TenantProfileType.DEFAULT)
       } as TenantProfileData});
     this.entityForm.patchValue({description: entity.description});
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 cdb4febcc0..12258ffd5f 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,127 +15,125 @@
     limitations under the License.
 
 -->
-<section [formGroup]="defaultTenantProfileConfigurationFormGroup">
-  <section formGroupName="configuration" 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('configuration.maxDevices').hasError('required')">
-        {{ 'tenant-profile.maximum-devices-required' | translate}}
-      </mat-error>
-      <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('configuration.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('configuration.maxAssets').hasError('required')">
-        {{ 'tenant-profile.maximum-assets-required' | translate}}
-      </mat-error>
-      <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('configuration.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.max-transport-messages</mat-label>
-      <input matInput required min="0" step="1"
-             formControlName="maxTransportMessages"
-             type="number">
-      <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('configuration.maxTransportMessages').hasError('required')">
-        {{ 'tenant-profile.max-transport-messages-range' | translate}}
-      </mat-error>
-      <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('configuration.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('configuration.maxTransportDataPoints').hasError('required')">
-        {{ 'tenant-profile.max-transport-data-points-required' | translate}}
-      </mat-error>
-      <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('configuration.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('configuration.maxREExecutions').hasError('required')">
-        {{ 'tenant-profile.max-r-e-executions-required' | translate}}
-      </mat-error>
-      <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('configuration.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('configuration.maxJSExecutions').hasError('required')">
-        {{ 'tenant-profile.max-j-s-executions-required' | translate}}
-      </mat-error>
-      <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('configuration.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('configuration.maxDPStorageDays').hasError('required')">
-        {{ 'tenant-profile.max-d-p-storage-days-required' | translate}}
-      </mat-error>
-      <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('configuration.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.max-rule-node-executions-per-message</mat-label>
-      <input matInput required min="0" step="1"
-             formControlName="maxRuleNodeExecutionsPerMessage"
-             type="number">
-      <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('configuration.maxRuleNodeExecutionsPerMessage').hasError('required')">
-        {{ 'tenant-profile.max-rule-node-executions-per-message-required' | translate}}
-      </mat-error>
-      <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('configuration.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.transport-tenant-msg-rate-limit</mat-label>
-      <input matInput formControlName="transportTenantMsgRateLimit">
-    </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-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-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-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-form-field>
-  </section>
+<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.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.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.transport-tenant-msg-rate-limit</mat-label>
+    <input matInput formControlName="transportTenantMsgRateLimit">
+  </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-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-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-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-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 f83b59c35a..1b54126fd5 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
@@ -19,11 +19,7 @@ import { ControlValueAccessor, FormBuilder, FormGroup, NG_VALUE_ACCESSOR, Valida
 import { Store } from '@ngrx/store';
 import { AppState } from '@app/core/core.state';
 import { coerceBooleanProperty } from '@angular/cdk/coercion';
-import {
-  DefaultTenantProfileConfiguration,
-  TenantProfileConfiguration,
-  TenantProfileType
-} from '@shared/models/tenant.model';
+import { DefaultTenantProfileConfiguration, TenantProfileConfiguration } from '@shared/models/tenant.model';
 import { isDefinedAndNotNull } from '@core/utils';
 
 @Component({
@@ -56,6 +52,25 @@ export class DefaultTenantProfileConfigurationComponent implements ControlValueA
 
   constructor(private store: Store<AppState>,
               private fb: FormBuilder) {
+    this.defaultTenantProfileConfigurationFormGroup = this.fb.group({
+      maxDevices: [null, [Validators.required, Validators.min(0)]],
+      maxAssets: [null, [Validators.required, Validators.min(0)]],
+      transportTenantMsgRateLimit: [null, []],
+      transportTenantTelemetryMsgRateLimit: [null, []],
+      transportTenantTelemetryDataPointsRateLimit: [null, []],
+      transportDeviceMsgRateLimit: [null, []],
+      transportDeviceTelemetryMsgRateLimit: [null, []],
+      transportDeviceTelemetryDataPointsRateLimit: [null, []],
+      maxTransportMessages: [null, [Validators.required, Validators.min(0)]],
+      maxTransportDataPoints: [null, [Validators.required, Validators.min(0)]],
+      maxREExecutions: [null, [Validators.required, Validators.min(0)]],
+      maxJSExecutions: [null, [Validators.required, Validators.min(0)]],
+      maxDPStorageDays: [null, [Validators.required, Validators.min(0)]],
+      maxRuleNodeExecutionsPerMessage: [null, [Validators.required, Validators.min(0)]]
+    });
+    this.defaultTenantProfileConfigurationFormGroup.valueChanges.subscribe(() => {
+      this.updateModel();
+    });
   }
 
   registerOnChange(fn: any): void {
@@ -66,27 +81,6 @@ export class DefaultTenantProfileConfigurationComponent implements ControlValueA
   }
 
   ngOnInit() {
-    this.defaultTenantProfileConfigurationFormGroup = this.fb.group({
-      configuration: this.fb.group({
-        maxDevices: [null, [Validators.required, Validators.min(0)]],
-        maxAssets: [null, [Validators.required, Validators.min(0)]],
-        transportTenantMsgRateLimit: [null, []],
-        transportTenantTelemetryMsgRateLimit: [null, []],
-        transportTenantTelemetryDataPointsRateLimit: [null, []],
-        transportDeviceMsgRateLimit: [null, []],
-        transportDeviceTelemetryMsgRateLimit: [null, []],
-        transportDeviceTelemetryDataPointsRateLimit: [null, []],
-        maxTransportMessages: [null, [Validators.required, Validators.min(0)]],
-        maxTransportDataPoints: [null, [Validators.required, Validators.min(0)]],
-        maxREExecutions: [null, [Validators.required, Validators.min(0)]],
-        maxJSExecutions: [null, [Validators.required, Validators.min(0)]],
-        maxDPStorageDays: [null, [Validators.required, Validators.min(0)]],
-        maxRuleNodeExecutionsPerMessage: [null, [Validators.required, Validators.min(0)]]
-      })
-    });
-    this.defaultTenantProfileConfigurationFormGroup.valueChanges.subscribe(() => {
-      this.updateModel();
-    });
   }
 
   setDisabledState(isDisabled: boolean): void {
@@ -100,15 +94,14 @@ export class DefaultTenantProfileConfigurationComponent implements ControlValueA
 
   writeValue(value: DefaultTenantProfileConfiguration | null): void {
     if (isDefinedAndNotNull(value)) {
-      this.defaultTenantProfileConfigurationFormGroup.patchValue({configuration: value}, {emitEvent: false});
+      this.defaultTenantProfileConfigurationFormGroup.patchValue(value, {emitEvent: false});
     }
   }
 
   private updateModel() {
     let configuration: TenantProfileConfiguration = null;
     if (this.defaultTenantProfileConfigurationFormGroup.valid) {
-      configuration = this.defaultTenantProfileConfigurationFormGroup.getRawValue().configuration;
-      configuration.type = TenantProfileType.DEFAULT;
+      configuration = this.defaultTenantProfileConfigurationFormGroup.getRawValue();
     }
     this.propagateChange(configuration);
   }
diff --git a/ui-ngx/src/assets/locale/locale.constant-pl_BR.json b/ui-ngx/src/assets/locale/locale.constant-pt_BR.json
similarity index 100%
rename from ui-ngx/src/assets/locale/locale.constant-pl_BR.json
rename to ui-ngx/src/assets/locale/locale.constant-pt_BR.json