diff --git a/bizmatch/src/app/pages/details/details-business-listing/details-business-listing.component.html b/bizmatch/src/app/pages/details/details-business-listing/details-business-listing.component.html
index c1a80ad..5ac7472 100644
--- a/bizmatch/src/app/pages/details/details-business-listing/details-business-listing.component.html
+++ b/bizmatch/src/app/pages/details/details-business-listing/details-business-listing.component.html
@@ -31,10 +31,11 @@
               <a routerLink="/details-user/{{ listingUser.id }}"
                 class="text-primary-600 dark:text-primary-500 hover:underline">{{ listingUser.firstname }} {{
                 listingUser.lastname }}</a>
-              <img *ngIf="listing.imageName"
-                ngSrc="{{ env.imageBaseUrl }}/pictures/logo/{{ listing.imageName }}.avif?_ts={{ ts }}"
-                class="mr-5 lg:mb-0" style="max-height: 30px; max-width: 100px" width="100" height="30"
-                alt="Business logo for {{ listingUser.firstname }} {{ listingUser.lastname }}" />
+              <div class="relative w-[100px] h-[30px] mr-5 lg:mb-0" *ngIf="listing.imageName">
+                <img ngSrc="{{ env.imageBaseUrl }}/pictures/logo/{{ listing.imageName }}.avif?_ts={{ ts }}" fill
+                  class="object-contain"
+                  alt="Business logo for {{ listingUser.firstname }} {{ listingUser.lastname }}" />
+              </div>
             </div>
           </div>
         </div>
diff --git a/bizmatch/src/app/pages/details/details-commercial-property-listing/details-commercial-property-listing.component.html b/bizmatch/src/app/pages/details/details-commercial-property-listing/details-commercial-property-listing.component.html
index 04f880d..65f2cb3 100644
--- a/bizmatch/src/app/pages/details/details-commercial-property-listing/details-commercial-property-listing.component.html
+++ b/bizmatch/src/app/pages/details/details-commercial-property-listing/details-commercial-property-listing.component.html
@@ -32,10 +32,11 @@
                 <a [routerLink]="['/details-user', detail.user.id]"
                   class="text-primary-600 dark:text-primary-500 hover:underline"> {{ detail.user.firstname }} {{
                   detail.user.lastname }} </a>
-                <img *ngIf="detail.user.hasCompanyLogo"
-                  [ngSrc]="detail.imageBaseUrl + '/pictures/logo/' + detail.imagePath + '.avif?_ts=' + detail.ts"
-                  class="mr-5 lg:mb-0" style="max-height: 30px; max-width: 100px" width="100" height="30"
-                  alt="Company logo for {{ detail.user.firstname }} {{ detail.user.lastname }}" />
+                <div class="relative w-[100px] h-[30px] mr-5 lg:mb-0" *ngIf="detail.user.hasCompanyLogo">
+                  <img [ngSrc]="detail.imageBaseUrl + '/pictures/logo/' + detail.imagePath + '.avif?_ts=' + detail.ts"
+                    fill class="object-contain"
+                    alt="Company logo for {{ detail.user.firstname }} {{ detail.user.lastname }}" />
+                </div>
               </div>
             </div>
           </div>
diff --git a/bizmatch/src/app/pages/details/details-user/details-user.component.html b/bizmatch/src/app/pages/details/details-user/details-user.component.html
index a877279..67a1a01 100644
--- a/bizmatch/src/app/pages/details/details-user/details-user.component.html
+++ b/bizmatch/src/app/pages/details/details-user/details-user.component.html
@@ -35,8 +35,10 @@
           </p>
         </div>
         @if(user.hasCompanyLogo){
-        <img ngSrc="{{ env.imageBaseUrl }}/pictures/logo/{{ emailToDirName(user.email) }}.avif?_ts={{ ts }}"
-          class="w-14 h-14 object-contain" width="56" height="56" alt="Company logo of {{ user.companyName }}" />
+        <div class="relative w-14 h-14">
+          <img ngSrc="{{ env.imageBaseUrl }}/pictures/logo/{{ emailToDirName(user.email) }}.avif?_ts={{ ts }}" fill
+            class="object-contain" alt="Company logo of {{ user.companyName }}" />
+        </div>
         }
         <!-- <img src="https://placehold.co/45x60" class="w-11 h-14" /> -->
       </div>
diff --git a/bizmatch/src/app/services/auth.service.ts b/bizmatch/src/app/services/auth.service.ts
index 307ab80..25663cd 100644
--- a/bizmatch/src/app/services/auth.service.ts
+++ b/bizmatch/src/app/services/auth.service.ts
@@ -183,11 +183,8 @@ export class AuthService {
     return Promise.resolve();
   }
   isAdmin(): Observable<boolean> {
-    return this.getUserRole().pipe(
+    return this.userRole$.pipe(
       map(role => role === 'admin'),
-      // take(1) ist optional - es beendet die Subscription, nachdem ein Wert geliefert wurde
-      // Nützlich, wenn du die Methode in einem Template mit dem async pipe verwendest
-      take(1),
     );
   }
   // Get current user's role from the server with caching
@@ -196,6 +193,9 @@ export class AuthService {
 
     // Cache zurücksetzen, wenn die Caching-Zeit abgelaufen ist oder kein Cache existiert
     if (!this.cachedUserRole$ || now - this.lastCacheTime > this.cacheDuration) {
+      if (!this.getLocalStorageItem('authToken')) {
+        return of(null);
+      }
       this.lastCacheTime = now;
       let headers = new HttpHeaders().set('X-Hide-Loading', 'true').set('Accept-Language', 'en-US');
       this.cachedUserRole$ = this.http.get<{ role: UserRole | null }>(`${environment.apiBaseUrl}/bizmatch/auth/me/role`, { headers }).pipe(