diff --git a/src/app/app.component.html b/src/app/app.component.html
index e5de678f..337d1184 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -26,7 +26,7 @@
 				</li>
 				<ng-template #accountDrop>
 					<li #accountParent class="nav-item icon" style="opacity: 1 !important;">
-						<img matRipple [src]="authManager.user.picture" [matMenuTriggerFor]="accountMenu" class="profilePicture" matTooltipPosition="below" [matTooltip]="authManager.user.name" fallback="more.svg" (error)="accountParent.style.removeProperty('opacity');" />
+						<img matRipple [src]="authManager.user.picture" [matMenuTriggerFor]="accountMenu" class="profilePicture" matTooltipPosition="below" [matTooltip]="authManager.user.username" fallback="more.svg" (error)="accountParent.style.removeProperty('opacity');" />
 					</li>
 					<mat-menu #accountMenu="matMenu">
 						<button class="dropButton" mat-menu-item (click)="this.openAccountDialog()">Settings</button>
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 4f79e186..4897b44c 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -17,7 +17,6 @@ export class AppComponent
 {
 	libraries: Library[];
 	isLoading: boolean = false;
-	account: Account;
 
 	constructor(private http: HttpClient, private router: Router, private location: Location, private authManager: AuthService, public dialog: MatDialog)
 	{
@@ -47,8 +46,6 @@ export class AppComponent
 
 		if (!navigator.userAgent.match(/Mobi/))
 			document.body.classList.add("hoverEnabled");
-		
-		this.account = this.authManager.getAccount();
 	}
 
 	openSearch()
@@ -81,11 +78,10 @@ export class AppComponent
 	
 	openAccountDialog()
 	{
-		const dialog = this.dialog.open(AccountComponent, {width: "500px", data: this.account});
+		const dialog = this.dialog.open(AccountComponent, {width: "500px", data: this.authManager.getAccount()});
 		dialog.afterClosed().subscribe((result: Account) => 
 		{
-			if (result)
-				this.account = result;
+			this.authManager.getUser();
 		});
 	}
 }
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index d75e2aa5..ba130cc0 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -26,14 +26,17 @@ export class AuthService
 			this.isAuthenticated = auth;
 		});
 
-		this.oidcSecurityService.getUserData().subscribe(userData => 
-		{
-			this.user = userData;
-			console.log("Got user data:");
-			console.log(this.user);
-		});
+		this.getUser();
 	}
 
+	getUser()
+	{
+		this.oidcSecurityService.getUserData().subscribe(userData =>
+		{
+			this.user = userData;
+		});
+	}
+	
 	login()
 	{
 		this.oidcSecurityService.authorize();
@@ -56,8 +59,6 @@ export class AuthService
 	{
 		if (!this.isAuthenticated)
 			return null;
-		console.log("Running get account");
-		console.log(this.user);
 		return {email: this.user.email, username: this.user.username, picture: this.user.picture};
 	}
 }