diff --git a/apps/picsa-apps/dashboard/src/app/modules/climate/components/api-status/api-status.html b/apps/picsa-apps/dashboard/src/app/modules/climate/components/api-status/api-status.html
index 5d6c2cf0..835256fe 100644
--- a/apps/picsa-apps/dashboard/src/app/modules/climate/components/api-status/api-status.html
+++ b/apps/picsa-apps/dashboard/src/app/modules/climate/components/api-status/api-status.html
@@ -1,7 +1,7 @@
 <!-- ready status template -->
-<div class="status-container" [attr.data-status]="status">
+<div class="status-container" [attr.data-status]="status()">
   @if(options().showStatusCode){
-  <span class="status-code" [attr.data-status]="status">{{code() || ''}}</span>
+  <span class="status-code" [attr.data-status]="status()">{{code() || ''}}</span>
   } @if(options().labels?.ready; as readyLabel){
   <div class="status-label">{{readyLabel}}</div>
   } @if(options().events?.refresh; as refreshEvent){
diff --git a/apps/picsa-apps/dashboard/src/app/modules/profile/components/sign-in-dialog/sign-in-dialog.component.html b/apps/picsa-apps/dashboard/src/app/modules/profile/components/sign-in-dialog/sign-in-dialog.component.html
index 0a09a061..8d85a1e5 100644
--- a/apps/picsa-apps/dashboard/src/app/modules/profile/components/sign-in-dialog/sign-in-dialog.component.html
+++ b/apps/picsa-apps/dashboard/src/app/modules/profile/components/sign-in-dialog/sign-in-dialog.component.html
@@ -3,21 +3,30 @@ <h1 mat-dialog-title>{{ title }}</h1>
   <form [formGroup]="form">
     <mat-form-field>
       <mat-label>Email</mat-label>
-      <input type="email" matInput formControlName="email" autocomplete="picsa-email"
-        [errorStateMatcher]="errorMatcher" />
+      <input
+        type="email"
+        matInput
+        formControlName="email"
+        autocomplete="picsa-email"
+        [errorStateMatcher]="errorMatcher"
+      />
       @if (form.controls.email.errors) {
       <mat-error>Please enter a valid email address</mat-error>
       }
     </mat-form-field>
     @if (template !== 'reset') {<mat-form-field>
       <mat-label>Password</mat-label>
-      <input type="password" matInput autocomplete="picsa-password" formControlName="password" />
-    </mat-form-field>}
-    @if(template==='register'){
+      <input type="password" matInput autocomplete="picsa-password" formControlName="password" /> </mat-form-field
+    >} @if(template==='register'){
     <mat-form-field>
       <mat-label>Repeat Password</mat-label>
-      <input type="password" matInput autocomplete="off" formControlName="passwordConfirm"
-        [errorStateMatcher]="errorMatcher" />
+      <input
+        type="password"
+        matInput
+        autocomplete="off"
+        formControlName="passwordConfirm"
+        [errorStateMatcher]="errorMatcher"
+      />
       @if (form.controls.passwordConfirm?.errors) {
       <mat-error>Password must match</mat-error>
       }
@@ -25,32 +34,38 @@ <h1 mat-dialog-title>{{ title }}</h1>
     }
   </form>
 </mat-dialog-content>
-<mat-dialog-actions style="display: flex; flex-direction: column;" align="start">
+<mat-dialog-actions class="flex flex-col">
   @if(template==='signIn'){
   <div class="action-buttons-container">
-    <button mat-button (click)="enableRegisterMode()">Create new account</button>
-    <button mat-button cdkFocusInitial (click)="handleSignIn()" style="margin-left: auto"
-      [disabled]="!form.valid || form.disabled">
+    <button mat-button (click)="enableRegisterMode()" class="flex-1">Create Account</button>
+    <button
+      mat-button
+      cdkFocusInitial
+      (click)="handleSignIn()"
+      class="flex-1"
+      [disabled]="!form.valid || form.disabled"
+    >
       Sign In
     </button>
   </div>
-  <button mat-button (click)="enableResetMode()">Reset Password</button>
+  <button class="mt-2" mat-button (click)="enableResetMode()">Forgot Password</button>
   } @if(template==='register'){
   <div class="action-buttons-container">
-    <button mat-button (click)="enableSignInMode()">Sign in</button>
-    <button mat-button cdkFocusInitial (click)="handleRegister()" style="margin-left: auto"
-      [disabled]="!form.valid || form.disabled">
+    <button
+      mat-button
+      cdkFocusInitial
+      (click)="handleRegister()"
+      class="ml-auto"
+      [disabled]="!form.valid || form.disabled"
+    >
       Register
     </button>
   </div>
-  }
-  @if(template==='reset'){
+  } @if(template==='reset'){
   <div class="action-buttons-container">
-    <button mat-button (click)="enableSignInMode()">Sign in</button>
-    <button mat-button (click)="handleReset()" style="margin-left: auto"
-      [disabled]="!form.controls.email.valid || form.disabled">
-      Send Reset Email
+    <button mat-button (click)="handleReset()" class="ml-auto" [disabled]="!form.controls.email.valid || form.disabled">
+      Reset
     </button>
   </div>
   }
-</mat-dialog-actions>
\ No newline at end of file
+</mat-dialog-actions>
diff --git a/apps/picsa-apps/dashboard/src/app/modules/profile/components/sign-in-dialog/sign-in-dialog.component.ts b/apps/picsa-apps/dashboard/src/app/modules/profile/components/sign-in-dialog/sign-in-dialog.component.ts
index 9aa2911e..abe0fc0c 100644
--- a/apps/picsa-apps/dashboard/src/app/modules/profile/components/sign-in-dialog/sign-in-dialog.component.ts
+++ b/apps/picsa-apps/dashboard/src/app/modules/profile/components/sign-in-dialog/sign-in-dialog.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
 import {
   FormControl,
   FormGroup,
@@ -50,8 +50,9 @@ export class SupabaseSignInDialogComponent {
     password: new FormControl('', Validators.required),
   });
 
+  private readonly dialogRef = inject(MatDialogRef<SupabaseSignInDialogComponent>);
+
   constructor(
-    private dialogRef: MatDialogRef<SupabaseSignInDialogComponent>,
     private notificationService: PicsaNotificationService,
     private supabaseAuthService: SupabaseAuthService
   ) {}
@@ -83,8 +84,8 @@ export class SupabaseSignInDialogComponent {
     const { data, error } = await this.supabaseAuthService.signInUser(email, password);
     console.log({ data, error });
     if (error) {
-      throw new Error(error.message);
       this.form.enable();
+      throw new Error(error.message);
     } else {
       this.dialogRef.close();
     }
@@ -94,20 +95,21 @@ export class SupabaseSignInDialogComponent {
     const { email, password } = this.form.value;
     const { error } = await this.supabaseAuthService.signUpUser(email, password);
     if (error) {
-      throw new Error(error.message);
       this.form.enable();
+      throw new Error(error.message);
     } else {
       this.dialogRef.close();
     }
   }
   public async handleReset() {
-     this.form.disable();
+    this.form.disable();
     const { email } = this.form.value;
     const { error } = await this.supabaseAuthService.resetEmailPassword(email);
     if (error) {
-      throw new Error(error.message);
       this.form.enable();
+      throw new Error(error.message);
     } else {
+      this.notificationService.showSuccessNotification(`Reset email sent, please check your inbox`,{duration:5000});
       this.dialogRef.close();
     }
   }