diff --git a/frontend/app/features/apps/pages/apps-page.component.html b/frontend/app/features/apps/pages/apps-page.component.html
index 7cea6473d..66209487f 100644
--- a/frontend/app/features/apps/pages/apps-page.component.html
+++ b/frontend/app/features/apps/pages/apps-page.component.html
@@ -1,8 +1,8 @@
 <sqx-title message="i18n:apps.listPageTitle"></sqx-title>
 
-<div class="panel-container page">  
+<div class="panel-container page" *ngIf="authState.userChanges | async; let user">  
     <div class="apps-section">
-        <h1 class="apps-title">{{ 'apps.welcomeTitle' | sqxTranslate: { user: authState.user?.displayName } }}</h1>
+        <h1 class="apps-title">{{ 'apps.welcomeTitle' | sqxTranslate: { user: user.displayName } }}</h1>
 
         <div class="subtext">
             {{ 'apps.welcomeSubtitle' | sqxTranslate }}
diff --git a/frontend/app/shared/components/assets/asset-folder.component.scss b/frontend/app/shared/components/assets/asset-folder.component.scss
index fbd449dfd..a2d87a346 100644
--- a/frontend/app/shared/components/assets/asset-folder.component.scss
+++ b/frontend/app/shared/components/assets/asset-folder.component.scss
@@ -14,6 +14,7 @@ img {
     & {
         border-bottom-width: 1px;
         border-width: 1px;
+        cursor: default;
         width: $asset-width;
     }