diff --git a/client/src/app/app.ts b/client/src/app/app.ts
index 1291ef7..3fc7d6a 100644
--- a/client/src/app/app.ts
+++ b/client/src/app/app.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, signal } from '@angular/core';
+import { Component, inject, OnInit, signal } from '@angular/core';
 import { RouterOutlet, RouterLinkWithHref, Router, NavigationEnd } from '@angular/router';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import {
@@ -8,6 +8,7 @@ import {
 	NgbNavLinkBase,
 } from '@ng-bootstrap/ng-bootstrap/nav';
 import { filter } from 'rxjs';
+import { APIService } from './services/api';
 
 @Component({
   selector: 'app-root',
@@ -17,6 +18,7 @@ import { filter } from 'rxjs';
 })
 export class App implements OnInit{
   protected readonly title = signal('client');
+  protected api = inject(APIService);
   active = '/';
 
   constructor(
@@ -24,6 +26,7 @@ export class App implements OnInit{
   ){}
 
   ngOnInit(): void {
+    this.api.checkAuthStatus().subscribe();
     this.router.events
     .pipe(filter(event => event instanceof NavigationEnd))
     .subscribe(() =>{
diff --git a/client/src/app/screens/screen-login/screen-login.html b/client/src/app/screens/screen-login/screen-login.html
index 2e75c76..4b06d71 100644
--- a/client/src/app/screens/screen-login/screen-login.html
+++ b/client/src/app/screens/screen-login/screen-login.html
@@ -48,7 +48,7 @@
                 type="submit"
                 class="btn btn-primary w-100 mb-3"
               >
-              @if (loading) {
+              @if (loading()) {
                 <span> Signing In... </span>
               }@else {
                 <span>Sign In</span>
@@ -57,13 +57,13 @@
 
 
               <!-- Error Alert -->
-              @if (error) {
+              @if (error()) {
               <ngb-alert
                 type="danger"
-                (closed)="error = null"
+                (closed)="error.set(null)"
                 [dismissible]="true"
               >
-                {{ error }}
+                {{ error() }}
               </ngb-alert>
               }
             </form>
diff --git a/client/src/app/screens/screen-login/screen-login.ts b/client/src/app/screens/screen-login/screen-login.ts
index 604d8b4..13a2062 100644
--- a/client/src/app/screens/screen-login/screen-login.ts
+++ b/client/src/app/screens/screen-login/screen-login.ts
@@ -1,5 +1,5 @@
 import { CommonModule } from '@angular/common';
-import { Component } from '@angular/core';
+import { Component, signal } from '@angular/core';
 import { Validators, FormBuilder, FormGroup, FormsModule, ReactiveFormsModule, Form } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
@@ -15,9 +15,9 @@ import { GenericMessage } from '@message/Message';
 export class ScreenLogin {
   loginForm: FormGroup;
   submitted = false;
-  loading = false;
+  loading = signal(false);
   showPassword = false;
-  error: string | null = null;
+  error = signal<string|null>(null);
 
   constructor(
     private api: APIService,
@@ -33,8 +33,8 @@ export class ScreenLogin {
 
   onSubmit() {
     this.submitted = true;
-    this.error = null;
-    this.loading = true;
+    this.error.set(null);
+    this.loading.set(true)
 
     this.api.login(this.loginForm.value.username, this.loginForm.value.password).subscribe({
       next: () => {
@@ -42,10 +42,9 @@ export class ScreenLogin {
         this.router.navigateByUrl(returnUrl);
       },
       error: (resp) => {
-        //FIXME error message displaying delayed, display message from server response
         let msg: GenericMessage = resp.error;
-        this.error = msg.message || 'Login failed. Please try again.';
-        this.loading = false;
+        this.error.set(msg.message || 'Login failed. Please try again.');
+        this.loading.set(false);
       }
     });
   }
diff --git a/client/src/app/screens/screen-profile/screen-profile.html b/client/src/app/screens/screen-profile/screen-profile.html
index ee40f38..7391daa 100644
--- a/client/src/app/screens/screen-profile/screen-profile.html
+++ b/client/src/app/screens/screen-profile/screen-profile.html
@@ -23,7 +23,7 @@
     <div class="card-body p-0">
       <div class="list-group list-group-flush">
         <!-- Transaction Item -->
-         @for (transaction of transactions; track $index) {
+         @for (transaction of transactions(); track $index) {
         <div class="list-group-item">
           <div class="d-flex justify-content-between align-items-center">
             <div class="d-flex align-items-center">
@@ -53,6 +53,7 @@
           </div>
         </div>
        }
+      @empty {<p class="text-muted">No transactions yet</p>}
     </div>
   </div>
 </div>
diff --git a/client/src/app/screens/screen-profile/screen-profile.ts b/client/src/app/screens/screen-profile/screen-profile.ts
index c1ca96c..4483e3d 100644
--- a/client/src/app/screens/screen-profile/screen-profile.ts
+++ b/client/src/app/screens/screen-profile/screen-profile.ts
@@ -1,5 +1,5 @@
 import { CommonModule, CurrencyPipe, DatePipe } from '@angular/common';
-import { Component, inject, OnInit } from '@angular/core';
+import { Component, inject, OnInit, signal } from '@angular/core';
 import { APIService } from '../../services/api';
 import Transaction from '@model/transaction';
 import { Router } from '@angular/router';
@@ -14,7 +14,7 @@ export class ScreenProfile implements OnInit{
   // TODO display real data
   username = 'John Doe';
   balance = 200;
-  transactions!: Transaction[];
+  transactions = signal<Transaction[]>([])
 
   constructor(
     protected api: APIService,
@@ -22,10 +22,9 @@ export class ScreenProfile implements OnInit{
   ){}
 
   ngOnInit(): void {
-    // FIXME transactions displaying delayed (only on second nav click)
     this.api.getTransactions().subscribe({
       next: (transactions) => {
-        this.transactions = transactions;
+        this.transactions.set(transactions);
       },
       error: (err) => {
         console.error('Error fetching transactions:', err);
diff --git a/client/src/app/services/auth-guard.ts b/client/src/app/services/auth-guard.ts
index 220659f..e787211 100644
--- a/client/src/app/services/auth-guard.ts
+++ b/client/src/app/services/auth-guard.ts
@@ -1,13 +1,14 @@
 import { inject } from '@angular/core';
 import { CanActivateFn, Router } from '@angular/router';
 import { APIService } from './api';
-import { map } from 'rxjs/operators';
+import { map, take } from 'rxjs/operators';
 
 export const authGuard: CanActivateFn = (route, state) => {
   const api = inject(APIService);
   const router = inject(Router);
 
-  return api.checkAuthStatus().pipe(
+  return api.isAuthenticated$.pipe(
+    take(1),
     map((isAuthenticated) => {
       if (isAuthenticated) {
         return true;