diff --git a/src/app/launch-dialog/launch-dialog.component.ts b/src/app/launch-dialog/launch-dialog.component.ts
index 2854bf18a513dcc6840c1e6b1d7282424c3e00dd..d805b009f213f9713d5cf59f37f2db7da20fde6f 100644
--- a/src/app/launch-dialog/launch-dialog.component.ts
+++ b/src/app/launch-dialog/launch-dialog.component.ts
@@ -89,7 +89,7 @@ export class LaunchDialogComponent implements OnInit {
       theme = 'strudel-light-theme';
     }
     if (this.identity !== null && this.app !== null) {
-      if (this.app.batchcmdurl !== null) {
+      if (this.app.batchcmdurl !== null && this.app.batchcmdurl !== undefined) {
         this.batchcmdurl = this.app.batchcmdurl+"?theme="+theme;
       } else {
         this.batchcmdurl = this.identity.site.url+"/"+encodeURIComponent(this.app.name)+"?theme="+theme;
diff --git a/src/app/launcher/launcher.component.ts b/src/app/launcher/launcher.component.ts
index f5d037fd3f7af591c8e7dea4e04ad387cdb06b39..6f0a5589b2dd4af94c638d0b5b07c0cbb5332ac7 100644
--- a/src/app/launcher/launcher.component.ts
+++ b/src/app/launcher/launcher.component.ts
@@ -171,6 +171,7 @@ export class LauncherComponent implements OnInit {
     this.subscriptions.push(this.authService.sshAuthzServers.subscribe(o => {this.updateSshAuthZServers(o)}));
     this.subscriptions.push(this.computeSitesService.identities.subscribe(o => this.navLogin(o)));
     this.subscriptions.push(this.computeSitesService.appidentities.subscribe(o => this.getHealth(o)));
+    this.subscriptions.push(timer(60000).pipe(repeat()).subscribe(() =>  { this.getHealth(this.computeSitesService.appidentities.value) } ));
     this.subscriptions.push(this.identity$.subscribe(o => this.jobsService.setId(o)));
   }