diff --git a/jslib/angular/src/services/auth-guard.service.ts b/jslib/angular/src/services/auth-guard.service.ts
index 18011a90a..12ccc5934 100644
--- a/jslib/angular/src/services/auth-guard.service.ts
+++ b/jslib/angular/src/services/auth-guard.service.ts
@@ -7,7 +7,7 @@ import { StateService } from "@/jslib/common/src/abstractions/state.service";
 import { VaultTimeoutService } from "@/jslib/common/src/abstractions/vaultTimeout.service";
 
 @Injectable()
-export class AuthGuardService  {
+export class AuthGuardService {
   constructor(
     private vaultTimeoutService: VaultTimeoutService,
     private router: Router,
diff --git a/jslib/angular/src/services/lock-guard.service.ts b/jslib/angular/src/services/lock-guard.service.ts
index 886320dcf..f04f7a6d1 100644
--- a/jslib/angular/src/services/lock-guard.service.ts
+++ b/jslib/angular/src/services/lock-guard.service.ts
@@ -5,7 +5,7 @@ import { StateService } from "@/jslib/common/src/abstractions/state.service";
 import { VaultTimeoutService } from "@/jslib/common/src/abstractions/vaultTimeout.service";
 
 @Injectable()
-export class LockGuardService  {
+export class LockGuardService {
   protected homepage = "vault";
   protected loginpage = "login";
   constructor(
diff --git a/jslib/angular/src/services/unauth-guard.service.ts b/jslib/angular/src/services/unauth-guard.service.ts
index cae8d5a86..ffb2c5ca6 100644
--- a/jslib/angular/src/services/unauth-guard.service.ts
+++ b/jslib/angular/src/services/unauth-guard.service.ts
@@ -5,7 +5,7 @@ import { StateService } from "@/jslib/common/src/abstractions/state.service";
 import { VaultTimeoutService } from "@/jslib/common/src/abstractions/vaultTimeout.service";
 
 @Injectable()
-export class UnauthGuardService  {
+export class UnauthGuardService {
   protected homepage = "vault";
   constructor(
     private vaultTimeoutService: VaultTimeoutService,
diff --git a/jslib/common/src/misc/utils.ts b/jslib/common/src/misc/utils.ts
index 0580af978..f65fe0d13 100644
--- a/jslib/common/src/misc/utils.ts
+++ b/jslib/common/src/misc/utils.ts
@@ -3,7 +3,6 @@ import { I18nService } from "../abstractions/i18n.service";
 
 import * as tldjs from "tldjs";
 
-
 const nodeURL = typeof window === "undefined" ? require("url") : null;
 
 export class Utils {
diff --git a/jslib/electron/src/services/electronLog.service.ts b/jslib/electron/src/services/electronLog.service.ts
index 5186259cf..c8bb19c98 100644
--- a/jslib/electron/src/services/electronLog.service.ts
+++ b/jslib/electron/src/services/electronLog.service.ts
@@ -15,7 +15,7 @@ export class ElectronLogService extends BaseLogService {
     super(isDev(), filter);
   }
 
-  init () {
+  init() {
     if (log.transports == null) {
       return;
     }
diff --git a/src/app/tabs/dashboard.component.html b/src/app/tabs/dashboard.component.html
index 14a559196..de6c18bb0 100644
--- a/src/app/tabs/dashboard.component.html
+++ b/src/app/tabs/dashboard.component.html
@@ -105,6 +105,11 @@ <h4>{{ "groups" | i18n }}</h4>
             <li *ngFor="let g of simGroups" title="{{ g.referenceId }}">
               <i class="bwi bwi-li bwi-sitemap"></i>
               {{ g.displayName }}
+              <ul class="small" *ngIf="g.users && g.users.length">
+                <li *ngFor="let u of g.users" title="{{ u.referenceId }}">
+                  {{ u.displayName }}
+                </li>
+              </ul>
             </li>
           </ul>
           <p *ngIf="!simGroups || !simGroups.length">{{ "noGroups" | i18n }}</p>
diff --git a/src/app/tabs/settings.component.html b/src/app/tabs/settings.component.html
index 6e0598846..7b004911c 100644
--- a/src/app/tabs/settings.component.html
+++ b/src/app/tabs/settings.component.html
@@ -419,7 +419,7 @@ <h3 class="card-header">{{ "directory" | i18n }}</h3>
               name="AdminUser"
               [(ngModel)]="gsuite.adminUser"
             />
-            <small class="text-muted form-text">{{ "ex" | i18n }} admin@company.com</small>
+            <small class="text-muted form-text">{{ "ex" | i18n }} admin&#64;company.com</small>
           </div>
           <div class="form-group">
             <label for="customerId">{{ "customerId" | i18n }}</label>
@@ -596,7 +596,7 @@ <h3 class="card-header">{{ "sync" | i18n }}</h3>
                 name="EmailSuffix"
                 [(ngModel)]="sync.emailSuffix"
               />
-              <small class="text-muted form-text">{{ "ex" | i18n }} @company.com</small>
+              <small class="text-muted form-text">{{ "ex" | i18n }} &#64;company.com</small>
             </div>
           </div>
         </div>
@@ -628,13 +628,13 @@ <h3 class="card-header">{{ "sync" | i18n }}</h3>
             <small
               class="text-muted form-text"
               *ngIf="directory === directoryType.AzureActiveDirectory"
-              >{{ "ex" | i18n }} exclude:joe@company.com</small
+              >{{ "ex" | i18n }} exclude:joe&#64;company.com</small
             >
             <small class="text-muted form-text" *ngIf="directory === directoryType.Okta"
-              >{{ "ex" | i18n }} exclude:joe@company.com | profile.firstName eq "John"</small
+              >{{ "ex" | i18n }} exclude:joe&#64;company.com | profile.firstName eq "John"</small
             >
             <small class="text-muted form-text" *ngIf="directory === directoryType.GSuite"
-              >{{ "ex" | i18n }} exclude:joe@company.com | orgName=Engineering</small
+              >{{ "ex" | i18n }} exclude:joe&#64;company.com | orgName=Engineering</small
             >
           </div>
           <div class="form-group" [hidden]="directory != directoryType.Ldap">
diff --git a/src/models/groupEntry.ts b/src/models/groupEntry.ts
index 8d2c9d22d..39b946446 100644
--- a/src/models/groupEntry.ts
+++ b/src/models/groupEntry.ts
@@ -1,9 +1,11 @@
 import { Entry } from "./entry";
+import { UserEntry } from "./userEntry";
 
 export class GroupEntry extends Entry {
   name: string;
   userMemberExternalIds = new Set<string>();
   groupMemberReferenceIds = new Set<string>();
+  users: UserEntry[] = [];
 
   get displayName(): string {
     if (this.name == null) {