diff --git a/ui/src/app/core/manage-plugins/manage-plugins-modal/manage-plugins-modal.component.ts b/ui/src/app/core/manage-plugins/manage-plugins-modal/manage-plugins-modal.component.ts
index cf494fddf..e07f4530a 100644
--- a/ui/src/app/core/manage-plugins/manage-plugins-modal/manage-plugins-modal.component.ts
+++ b/ui/src/app/core/manage-plugins/manage-plugins-modal/manage-plugins-modal.component.ts
@@ -237,9 +237,12 @@ export class ManagePluginsModalComponent implements OnInit, OnDestroy {
     this.io.request('get-homebridge-child-bridge-status').subscribe((data) => {
       this.childBridges = data;
     });
+    return this.childBridges;
   }
 
   public async onRestartChildBridgeClick(bridge) {
+    const childBridges = this.getChildBridgeMetadata();
+    const childBridge = childBridges.find((x) => x.username === bridge.username);
     bridge.restartInProgress = true;
     try {
       await this.io.request('restart-child-bridge', bridge.username).toPromise();
diff --git a/ui/src/app/shared/layout/layout.component.html b/ui/src/app/shared/layout/layout.component.html
index 6243f7139..744a1c559 100644
--- a/ui/src/app/shared/layout/layout.component.html
+++ b/ui/src/app/shared/layout/layout.component.html
@@ -98,7 +98,7 @@
               {{ 'menu.linux.label_shutdown_server' | translate }}
             </a>
             <a href="javascript:void(0)" class="dropdown-item" (click)="$auth.logout()" *ngIf="$settings.formAuth">
-              {{ 'menu.tooltip_logout' | translate }}
+              {{ 'menu.tooltip_logout' | translate }} - {{ $auth.user.username }}
             </a>
           </div>
         </li>