diff --git a/libs/ui/src/lib/accounts-table/accounts-table.component.html b/libs/ui/src/lib/accounts-table/accounts-table.component.html
index 63a7a89b6..70e8c41bf 100644
--- a/libs/ui/src/lib/accounts-table/accounts-table.component.html
+++ b/libs/ui/src/lib/accounts-table/accounts-table.component.html
@@ -3,7 +3,7 @@
     <button
       class="align-items-center d-flex"
       mat-stroked-button
-      [disabled]="dataSource()?.data.length < 2"
+      [disabled]="dataSource?.data.length < 2"
       (click)="onTransferBalance()"
     >
       <ion-icon class="mr-2" name="arrow-redo-outline" />
@@ -19,7 +19,7 @@
     matSort
     matSortActive="name"
     matSortDirection="asc"
-    [dataSource]="dataSource()"
+    [dataSource]="dataSource"
   >
     <ng-container matColumnDef="status">
       <th
diff --git a/libs/ui/src/lib/accounts-table/accounts-table.component.ts b/libs/ui/src/lib/accounts-table/accounts-table.component.ts
index 052923aae..e0b2d2ef5 100644
--- a/libs/ui/src/lib/accounts-table/accounts-table.component.ts
+++ b/libs/ui/src/lib/accounts-table/accounts-table.component.ts
@@ -142,7 +142,7 @@ export class GfAccountsTableComponent {
     });
   }
 
-  public onDeleteAccount(aId: string) {
+  protected onDeleteAccount(aId: string) {
     this.notificationService.confirm({
       confirmFn: () => {
         this.accountDeleted.emit(aId);
@@ -152,7 +152,7 @@ export class GfAccountsTableComponent {
     });
   }
 
-  public onOpenAccountDetailDialog(accountId: string) {
+  protected onOpenAccountDetailDialog(accountId: string) {
     if (this.hasPermissionToOpenDetails) {
       this.router.navigate([], {
         queryParams: { accountId, accountDetailDialog: true }
@@ -160,17 +160,17 @@ export class GfAccountsTableComponent {
     }
   }
 
-  public onOpenComment(aComment: string) {
+  protected onOpenComment(aComment: string) {
     this.notificationService.alert({
       title: aComment
     });
   }
 
-  public onTransferBalance() {
+  protected onTransferBalance() {
     this.transferBalance.emit();
   }
 
-  public onUpdateAccount(aAccount: Account) {
+  protected onUpdateAccount(aAccount: Account) {
     this.accountToUpdate.emit(aAccount);
   }
 }