diff --git a/smp-angular/src/app/common/panels/document-events-panel/document-events-panel.component.html b/smp-angular/src/app/common/panels/document-events-panel/document-events-panel.component.html
index fec6a514721fd8f362a73afeaf4e9f38e52d4485..0b3de0563bfe94b1b4b92e71fc0c323b4dda7f62 100644
--- a/smp-angular/src/app/common/panels/document-events-panel/document-events-panel.component.html
+++ b/smp-angular/src/app/common/panels/document-events-panel/document-events-panel.component.html
@@ -56,7 +56,7 @@
       </tr>
     </table>
   </div>
-  <mat-paginator [pageSizeOptions]="[5, 10, 25, 100]" showFirstLastButtons
+  <mat-paginator [pageSizeOptions]="[5, 10, 15, 20]" showFirstLastButtons
                  [pageSize]="10" [length]="eventDataSource.data?.length"
                  attr.aria-label="{{ 'document.events.panel.label.select.page' | translate }}"></mat-paginator>
 
diff --git a/smp-angular/src/app/common/panels/document-properties-panel/document-properties-panel.component.html b/smp-angular/src/app/common/panels/document-properties-panel/document-properties-panel.component.html
index f1dc9a7eab8c8f754220293913435c77df8fbe89..c99f7010c32968eabcdbcf6a32b7e3a87bb2bc44 100644
--- a/smp-angular/src/app/common/panels/document-properties-panel/document-properties-panel.component.html
+++ b/smp-angular/src/app/common/panels/document-properties-panel/document-properties-panel.component.html
@@ -64,7 +64,7 @@
           </tr>
         </table>
       </div>
-      <mat-paginator [pageSizeOptions]="[5, 10, 25, 100]" showFirstLastButtons
+      <mat-paginator [pageSizeOptions]="[5, 10, 15, 20]" showFirstLastButtons
                      [pageSize]="10" [length]="propertyDataSource.data?.length"
                      attr.aria-label="{{ 'document.properties.panel.label.select.page' | translate }}"></mat-paginator>
 
diff --git a/smp-angular/src/app/common/panels/document-versions-panel/document-versions-panel.component.html b/smp-angular/src/app/common/panels/document-versions-panel/document-versions-panel.component.html
index 888070643239c2374d704d1dae8e81343e0a52b0..47c26cb674f6bbbb0516def7ab5e332364f809de 100644
--- a/smp-angular/src/app/common/panels/document-versions-panel/document-versions-panel.component.html
+++ b/smp-angular/src/app/common/panels/document-versions-panel/document-versions-panel.component.html
@@ -51,7 +51,7 @@
       </tr>
     </table>
   </div>
-  <mat-paginator [pageSizeOptions]="[5, 10, 25, 100]" showFirstLastButtons
+  <mat-paginator [pageSizeOptions]="[5, 10, 15, 20]" showFirstLastButtons
                  [pageSize]="10" [length]="versionDataSource.data?.length"
                  attr.aria-label="{{ 'document.versions.panel.label.select.page' | translate }}"></mat-paginator>
 
diff --git a/smp-angular/src/app/system-settings/admin-domain/admin-domain.component.ts b/smp-angular/src/app/system-settings/admin-domain/admin-domain.component.ts
index f4f95cd9aa99d9dd07e371d84f2868a1921d4994..dca44484f4f361ba20a59801033a1161a0aaabaa 100644
--- a/smp-angular/src/app/system-settings/admin-domain/admin-domain.component.ts
+++ b/smp-angular/src/app/system-settings/admin-domain/admin-domain.component.ts
@@ -249,6 +249,7 @@ export class AdminDomainComponent implements OnInit, OnDestroy, AfterViewInit, B
       status: EntityStatus.NEW,
       smlRegistered: false,
       smlClientCertAuth: false,
+      adminMemberCount: 0,
     }
   }
 
diff --git a/smp-angular/src/app/system-settings/admin-domain/domain-panel/domain-panel.component.html b/smp-angular/src/app/system-settings/admin-domain/domain-panel/domain-panel.component.html
index afd05698d7bd6cdfe390d3adb443a1dfd174849a..fe2db960c9ab76e15d68def2c8fe8aa136e3cd44 100644
--- a/smp-angular/src/app/system-settings/admin-domain/domain-panel/domain-panel.component.html
+++ b/smp-angular/src/app/system-settings/admin-domain/domain-panel/domain-panel.component.html
@@ -8,7 +8,7 @@
                        type="warning"
                        [htmlContent]="warningMessage"></smp-warning-panel>
     <mat-form-field style="width:100%">
-      <mat-label>{{ "domain.panel.label.domain" | translate: {value: domainForm.controls['adminMemberCount'].value} }}</mat-label>
+      <mat-label>{{ "domain.panel.label.domain" | translate }}</mat-label>
       <input matInput
              id="domainCode_id" #domainCode
              matTooltip="{{ 'domain.panel.tooltip.domain' | translate }}"
diff --git a/smp-angular/src/assets/i18n/en.json b/smp-angular/src/assets/i18n/en.json
index 400f72e446f520814d9530aca93db38903348bcc..024510500f1c067bbe7ad8c36c901c53534df550 100644
--- a/smp-angular/src/assets/i18n/en.json
+++ b/smp-angular/src/assets/i18n/en.json
@@ -585,7 +585,7 @@
 
   "domain.panel.button.reset": "Reset",
   "domain.panel.button.save": "Save",
-  "domain.panel.label.domain": "Domain Code [{{value}}]",
+  "domain.panel.label.domain": "Domain Code",
   "domain.panel.label.domain.already.exists": "The Domain code already exists!",
   "domain.panel.label.domain.default.resource.type": "Default resource type for the domain",
   "domain.panel.label.domain.mandatory": "Domain code must contain only chars and numbers and must be less than 63 chars long.",