diff --git a/src/app/_eth/accountIndex.ts b/src/app/_eth/accountIndex.ts
index 2300a9f..bf7445b 100644
--- a/src/app/_eth/accountIndex.ts
+++ b/src/app/_eth/accountIndex.ts
@@ -1,5 +1,5 @@
 import Web3 from 'web3';
-import {Web3Service} from '@app/_services/web3.service';
+import { Web3Service } from '@app/_services/web3.service';
 
 const abi: Array<any> = require('@src/assets/js/block-sync/data/AccountsIndex.json');
 const web3: Web3 = Web3Service.getInstance();
diff --git a/src/app/_eth/token-registry.ts b/src/app/_eth/token-registry.ts
index 2124752..e1d56fb 100644
--- a/src/app/_eth/token-registry.ts
+++ b/src/app/_eth/token-registry.ts
@@ -1,5 +1,5 @@
 import Web3 from 'web3';
-import {Web3Service} from '@app/_services/web3.service';
+import { Web3Service } from '@app/_services/web3.service';
 
 const abi: Array<any> = require('@src/assets/js/block-sync/data/TokenUniqueSymbolIndex.json');
 const web3: Web3 = Web3Service.getInstance();
diff --git a/src/app/_services/block-sync.service.ts b/src/app/_services/block-sync.service.ts
index 26fbcd2..06f2794 100644
--- a/src/app/_services/block-sync.service.ts
+++ b/src/app/_services/block-sync.service.ts
@@ -6,7 +6,7 @@ import { TransactionService } from '@app/_services/transaction.service';
 import { environment } from '@src/environments/environment';
 import { LoggingService } from '@app/_services/logging.service';
 import { RegistryService } from '@app/_services/registry.service';
-import {Web3Service} from '@app/_services/web3.service';
+import { Web3Service } from '@app/_services/web3.service';
 
 @Injectable({
   providedIn: 'root',
diff --git a/src/app/_services/registry.service.ts b/src/app/_services/registry.service.ts
index 4bcd4dc..3aa990c 100644
--- a/src/app/_services/registry.service.ts
+++ b/src/app/_services/registry.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { environment } from '@src/environments/environment';
 import { CICRegistry, FileGetter } from 'cic-client';
 import { HttpGetter } from '@app/_helpers';
-import {Web3Service} from '@app/_services/web3.service';
+import { Web3Service } from '@app/_services/web3.service';
 
 @Injectable({
   providedIn: 'root',
diff --git a/src/app/_services/transaction.service.ts b/src/app/_services/transaction.service.ts
index 8788905..09367ee 100644
--- a/src/app/_services/transaction.service.ts
+++ b/src/app/_services/transaction.service.ts
@@ -17,7 +17,7 @@ import { HttpClient } from '@angular/common/http';
 import { CICRegistry } from 'cic-client';
 import { RegistryService } from '@app/_services/registry.service';
 import Web3 from 'web3';
-import {Web3Service} from '@app/_services/web3.service';
+import { Web3Service } from '@app/_services/web3.service';
 const vCard = require('vcard-parser');
 
 @Injectable({
diff --git a/src/app/_services/web3.service.ts b/src/app/_services/web3.service.ts
index 797611f..b7f5cd4 100644
--- a/src/app/_services/web3.service.ts
+++ b/src/app/_services/web3.service.ts
@@ -1,14 +1,14 @@
 import { Injectable } from '@angular/core';
 import Web3 from 'web3';
-import {environment} from '@src/environments/environment';
+import { environment } from '@src/environments/environment';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class Web3Service {
   private static web3: Web3;
 
-  constructor() { }
+  constructor() {}
 
   public static getInstance(): Web3 {
     if (!Web3Service.web3) {
diff --git a/src/app/pages/accounts/account-details/account-details.component.ts b/src/app/pages/accounts/account-details/account-details.component.ts
index e7e01f3..1abc6a1 100644
--- a/src/app/pages/accounts/account-details/account-details.component.ts
+++ b/src/app/pages/accounts/account-details/account-details.component.ts
@@ -121,8 +121,10 @@ export class AccountDetailsComponent implements OnInit {
             location: this.account.location.area,
             locationType: this.account.location.area_type,
           });
-          this.userService.getAccountStatus(this.account.vcard?.tel[0].value).pipe(first())
-            .subscribe(response => this.accountStatus = response.status);
+          this.userService
+            .getAccountStatus(this.account.vcard?.tel[0].value)
+            .pipe(first())
+            .subscribe((response) => (this.accountStatus = response.status));
         } else {
           alert('Account not found!');
         }
diff --git a/src/app/pages/transactions/transactions.component.html b/src/app/pages/transactions/transactions.component.html
index 23bbe77..1d4adc8 100644
--- a/src/app/pages/transactions/transactions.component.html
+++ b/src/app/pages/transactions/transactions.component.html
@@ -48,12 +48,12 @@
 
             <ng-container matColumnDef="sender">
               <th mat-header-cell *matHeaderCellDef mat-sort-header> Sender </th>
-              <td mat-cell *matCellDef="let transaction"> {{transaction?.sender?.vcard.fn[0].value}} </td>
+              <td mat-cell *matCellDef="let transaction"> {{transaction?.sender?.vcard.fn[0].value || transaction.from}} </td>
             </ng-container>
 
             <ng-container matColumnDef="recipient">
               <th mat-header-cell *matHeaderCellDef mat-sort-header> Recipient </th>
-              <td mat-cell *matCellDef="let transaction"> {{transaction?.recipient?.vcard.fn[0].value}} </td>
+              <td mat-cell *matCellDef="let transaction"> {{transaction?.recipient?.vcard.fn[0].value || transaction.to }} </td>
             </ng-container>
 
             <ng-container matColumnDef="value">