diff --git a/CHANGELOG.md b/CHANGELOG.md
index c099a7adc..8b50fa887 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ 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 an issue in the user table of the admin control panel with missing data
+
 ## 0.86.1 - 18.04.2021
 
 ### Added
@@ -18,7 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Changed the about page for the new license
 - Optimized the data management for historical data
 - Optimized the exchange rate service
-- Improved the user table in the admin control panel
+- Improved the user table of the admin control panel
 
 ### Fixed
 
diff --git a/apps/client/src/app/pages/about/about-page.html b/apps/client/src/app/pages/about/about-page.html
index 25d28c4ab..8929afa8f 100644
--- a/apps/client/src/app/pages/about/about-page.html
+++ b/apps/client/src/app/pages/about/about-page.html
@@ -13,7 +13,7 @@
             <a href="https://dotsilver.ch">Thomas Kaul</a>.
             <ng-container *ngIf="lastPublish">
               This instance has been last published on {{ lastPublish
-              }}</ng-container
+              }}.</ng-container
             >
           </p>
           <p>
diff --git a/apps/client/src/app/pages/admin/admin-page.html b/apps/client/src/app/pages/admin/admin-page.html
index d8b17cafe..330a9a0e3 100644
--- a/apps/client/src/app/pages/admin/admin-page.html
+++ b/apps/client/src/app/pages/admin/admin-page.html
@@ -99,13 +99,13 @@
                   {{ userItem.createdAt | date: defaultDateFormat }}
                 </td>
                 <td class="mat-cell pr-2 py-2 text-truncate">
-                  {{ userItem._count.Order }}
+                  {{ userItem._count?.Order }}
                 </td>
                 <td class="mat-cell pr-2 py-2 text-truncate">
-                  {{ userItem.Analytics.activityCount }}
+                  {{ userItem.Analytics?.activityCount }}
                 </td>
                 <td class="mat-cell pr-2 py-2 text-truncate">
-                  {{ formatDistanceToNow(userItem.Analytics.updatedAt) }}
+                  {{ formatDistanceToNow(userItem.Analytics?.updatedAt) }}
                 </td>
               </tr>
             </tbody>