diff --git a/CHANGELOG.md b/CHANGELOG.md
index 810005908..5a16c6485 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+### Fixed
+
+- Fixed the links of cryptocurrency assets in the positions table
+- Fixed various values in the impersonation mode which have not been nullified
+
 ## 1.58.1 - 03.10.2021
 
 ### Fixed
diff --git a/apps/api/src/app/portfolio/portfolio.controller.ts b/apps/api/src/app/portfolio/portfolio.controller.ts
index 24811a1b3..62406107d 100644
--- a/apps/api/src/app/portfolio/portfolio.controller.ts
+++ b/apps/api/src/app/portfolio/portfolio.controller.ts
@@ -175,8 +175,9 @@ export class PortfolioController {
         portfolioPosition.grossPerformance = null;
         portfolioPosition.investment =
           portfolioPosition.investment / totalInvestment;
-
+        portfolioPosition.netPerformance = null;
         portfolioPosition.quantity = null;
+        portfolioPosition.value = portfolioPosition.value / totalValue;
       }
 
       for (const [name, { current, original }] of Object.entries(accounts)) {
diff --git a/apps/client/src/app/components/accounts-table/accounts-table.component.html b/apps/client/src/app/components/accounts-table/accounts-table.component.html
index 9521652f9..c38bb4073 100644
--- a/apps/client/src/app/components/accounts-table/accounts-table.component.html
+++ b/apps/client/src/app/components/accounts-table/accounts-table.component.html
@@ -51,7 +51,7 @@
 
   <ng-container matColumnDef="balance">
     <th *matHeaderCellDef class="px-1 text-right" i18n mat-header-cell>
-      Balance
+      Cash Balance
     </th>
     <td *matCellDef="let element" class="px-1 text-right" mat-cell>
       <gf-value
diff --git a/apps/client/src/app/components/positions-table/positions-table.component.html b/apps/client/src/app/components/positions-table/positions-table.component.html
index 0b3faee85..cf7fb1eb4 100644
--- a/apps/client/src/app/components/positions-table/positions-table.component.html
+++ b/apps/client/src/app/components/positions-table/positions-table.component.html
@@ -83,10 +83,10 @@
     *matRowDef="let row; columns: displayedColumns"
     mat-row
     [ngClass]="{
-      'cursor-pointer': !ignoreAssetClasses.includes(row.assetClass)
+      'cursor-pointer': !ignoreAssetSubClasses.includes(row.assetSubClass)
     }"
     (click)="
-      !ignoreAssetClasses.includes(row.assetClass) &&
+      !ignoreAssetSubClasses.includes(row.assetSubClass) &&
         onOpenPositionDialog({ symbol: row.symbol })
     "
   ></tr>
diff --git a/apps/client/src/app/components/positions-table/positions-table.component.ts b/apps/client/src/app/components/positions-table/positions-table.component.ts
index 7d3b997e8..8f287786c 100644
--- a/apps/client/src/app/components/positions-table/positions-table.component.ts
+++ b/apps/client/src/app/components/positions-table/positions-table.component.ts
@@ -42,7 +42,7 @@ export class PositionsTableComponent implements OnChanges, OnDestroy, OnInit {
   public dataSource: MatTableDataSource<PortfolioPosition> =
     new MatTableDataSource();
   public displayedColumns = [];
-  public ignoreAssetClasses = [AssetClass.CASH.toString()];
+  public ignoreAssetSubClasses = [AssetClass.CASH.toString()];
   public isLoading = true;
   public pageSize = 7;
   public routeQueryParams: Subscription;