diff --git a/src/Squidex/app/features/administration/pages/users/user-page.component.ts b/src/Squidex/app/features/administration/pages/users/user-page.component.ts
index 105c1d55f..a14838100 100644
--- a/src/Squidex/app/features/administration/pages/users/user-page.component.ts
+++ b/src/Squidex/app/features/administration/pages/users/user-page.component.ts
@@ -27,7 +27,7 @@ import { UserCreated, UserUpdated } from './../messages';
     ]
 })
 export class UserPageComponent  implements OnInit {
-    private user: UserDto;
+    public user: UserDto;
 
     public userFormSubmitted = false;
     public userForm: FormGroup;
diff --git a/src/Squidex/app/features/settings/pages/clients/client.component.html b/src/Squidex/app/features/settings/pages/clients/client.component.html
index c6bb7a5b7..f7d867a31 100644
--- a/src/Squidex/app/features/settings/pages/clients/client.component.html
+++ b/src/Squidex/app/features/settings/pages/clients/client.component.html
@@ -50,7 +50,7 @@
         <tr>
             <td>Client Id:</td>
             <td>
-                <input readonly class="form-control" value="{{appName}}:{{client.id}}" #inputName />
+                <input readonly class="form-control" value="{{ctx.appName}}:{{client.id}}" #inputName />
             </td>
             <td>
                 <button type="button" class="btn btn-primary btn-link" [sqxCopy]="inputName">
diff --git a/src/Squidex/app/shared/guards/unset-app.guard.spec.ts b/src/Squidex/app/shared/guards/unset-app.guard.spec.ts
new file mode 100644
index 000000000..f31d720b8
--- /dev/null
+++ b/src/Squidex/app/shared/guards/unset-app.guard.spec.ts
@@ -0,0 +1,28 @@
+/*
+ * Squidex Headless CMS
+ *
+ * @license
+ * Copyright (c) Sebastian Stehle. All rights reserved
+ */
+
+import { IMock, Mock, Times } from 'typemoq';
+
+import { AppsStoreService } from 'shared';
+
+import { UnsetAppGuard } from './unset-app.guard';
+
+describe('UnsetAppGuard', () => {
+    let appStoreService: IMock<AppsStoreService>;
+
+    beforeEach(() => {
+        appStoreService = Mock.ofType(AppsStoreService);
+    });
+
+    it('should unselect app', () => {
+        const guard = new UnsetAppGuard(appStoreService.object);
+
+        expect(guard.canActivate(<any>{}, <any>{})).toBeTruthy();
+
+        appStoreService.verify(x => x.selectApp(null), Times.once());
+    });
+});
\ No newline at end of file