diff --git a/apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.component.ts b/apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.component.ts
index 5aacbd457..ebe9983c0 100644
--- a/apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.component.ts
+++ b/apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.component.ts
@@ -9,11 +9,16 @@ import { MAT_DIALOG_DATA } from '@angular/material/dialog';
   standalone: false
 })
 export class ShowAccessTokenDialog {
-  public isAgreeButtonDisabled = true;
+  public isCreateAccountButtonDisabled = true;
+  public disclaimerChecked = false;
 
   public constructor(@Inject(MAT_DIALOG_DATA) public data: any) {}
 
-  public enableAgreeButton() {
-    this.isAgreeButtonDisabled = false;
+  public onChangeDislaimerChecked() {
+    this.disclaimerChecked = !this.disclaimerChecked;
+  }
+
+  public enableCreateAccountButton() {
+    this.isCreateAccountButtonDisabled = false;
   }
 }
diff --git a/apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.html b/apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.html
index 0a6a2e5e3..9126dc359 100644
--- a/apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.html
+++ b/apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.html
@@ -5,44 +5,106 @@
   }
 </h1>
 <div class="py-3" mat-dialog-content>
-  <div>
-    <mat-form-field appearance="outline" class="w-100">
-      <mat-label i18n>Security Token</mat-label>
-      <textarea
-        cdkTextareaAutosize
-        matInput
-        readonly
-        type="text"
-        [(value)]="data.accessToken"
-      ></textarea>
-      <div class="float-right mt-3">
-        <button
-          color="secondary"
-          mat-flat-button
-          [cdkCopyToClipboard]="data.accessToken"
-          (click)="enableAgreeButton()"
+  <mat-stepper #stepper linear>
+    <mat-step
+      editable="false"
+      state="disclaimer"
+      [completed]="disclaimerChecked"
+    >
+      <ng-template matStepLabel>Terms and Conditions</ng-template>
+      <div class="terms-and-conditions pt-2" i18n>
+        Please take a moment to read and accept the
+        <a
+          href="https://ghostfol.io/en/about/privacy-policy"
+          target="_blank"
+          title="Terms and Conditions"
         >
-          <ion-icon class="mr-1" name="copy-outline" /><span i18n
-            >Copy to clipboard</span
+          terms and conditions</a
+        >. Remember to keep your security token safe. If you lose it, you will
+        not be able to recover your account.
+      </div>
+      <mat-checkbox
+        class="pt-2"
+        color="primary"
+        i18n
+        (change)="onChangeDislaimerChecked()"
+      >
+        I agree to the terms and understand that if I lose my security token, I
+        cannot recover my account.
+      </mat-checkbox>
+      <div mat-dialog-actions>
+        <div class="flex-grow-1">
+          <button i18n mat-button [mat-dialog-close]="undefined">Cancel</button>
+        </div>
+        <div>
+          <button
+            color="primary"
+            i18n
+            mat-flat-button
+            matStepperNext
+            [disabled]="!disclaimerChecked"
           >
-        </button>
+            Continue
+          </button>
+        </div>
       </div>
-    </mat-form-field>
-  </div>
-  <p i18n>
-    I agree to have stored my <i>Security Token</i> from above in a secure
-    place. If I lose it, I cannot get my account back.
-  </p>
-</div>
-<div class="justify-content-end" mat-dialog-actions>
-  <button i18n mat-flat-button [mat-dialog-close]="undefined">Cancel</button>
-  <button
-    color="primary"
-    mat-flat-button
-    [disabled]="isAgreeButtonDisabled"
-    [mat-dialog-close]="data"
-  >
-    <span i18n>Agree and continue</span>
-    <ion-icon class="ml-1" name="arrow-forward-outline" />
-  </button>
+    </mat-step>
+    <mat-step editable="false" state="copy">
+      <ng-template matStepLabel>Security Token</ng-template>
+      <div class="pt-2" i18n>
+        Here is your security token. It is only visible once, please store and
+        keep it in a safe place.
+      </div>
+      <mat-form-field appearance="outline" class="w-100 pt-3">
+        <mat-label i18n>Security Token</mat-label>
+        <textarea
+          cdkTextareaAutosize
+          matInput
+          readonly
+          type="text"
+          [(value)]="data.accessToken"
+        ></textarea>
+        <div class="float-right mt-1">
+          <button
+            color="secondary"
+            mat-flat-button
+            [cdkCopyToClipboard]="data.accessToken"
+            (click)="enableCreateAccountButton()"
+          >
+            <ion-icon class="mr-1" name="copy-outline" />
+            <span i18n> Copy to clipboard </span>
+          </button>
+        </div>
+      </mat-form-field>
+      <div align="end" mat-dialog-actions>
+        <div>
+          <button
+            color="primary"
+            mat-flat-button
+            matStepperNext
+            [disabled]="isCreateAccountButtonDisabled"
+            [mat-dialog-close]="data"
+          >
+            <span i18n>Create Account</span>
+            <ion-icon class="ml-1" name="arrow-forward-outline" />
+          </button>
+        </div>
+      </div>
+    </mat-step>
+
+    <!-- Custom icons -->
+    <ng-template matStepperIcon="disclaimer">
+      <ion-icon name="information-outline"></ion-icon>
+    </ng-template>
+    <ng-template matStepperIcon="create">
+      <ion-icon name="information-outline"></ion-icon>
+    </ng-template>
+    <ng-template matStepperIcon="copy">
+      <ion-icon name="copy-outline"></ion-icon>
+    </ng-template>
+    <ng-template matStepperIcon="done">
+      <ion-icon name="checkmark-outline"></ion-icon>
+    </ng-template>
+  </mat-stepper>
+  <div></div>
 </div>
diff --git a/apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.module.ts b/apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.module.ts
index d537fbe7f..89438126d 100644
--- a/apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.module.ts
+++ b/apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.module.ts
@@ -1,12 +1,18 @@
 import { ClipboardModule } from '@angular/cdk/clipboard';
+import { STEPPER_GLOBAL_OPTIONS } from '@angular/cdk/stepper';
 import { TextFieldModule } from '@angular/cdk/text-field';
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MatButtonModule } from '@angular/material/button';
+import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatDialogModule } from '@angular/material/dialog';
-import { MatFormFieldModule } from '@angular/material/form-field';
+import {
+  MAT_FORM_FIELD_DEFAULT_OPTIONS,
+  MatFormFieldModule
+} from '@angular/material/form-field';
 import { MatInputModule } from '@angular/material/input';
+import { MatStepperModule } from '@angular/material/stepper';
 
 import { ShowAccessTokenDialog } from './show-access-token-dialog.component';
 
@@ -21,7 +27,23 @@ import { ShowAccessTokenDialog } from './show-access-token-dialog.component';
     MatFormFieldModule,
     MatInputModule,
     ReactiveFormsModule,
-    TextFieldModule
+    TextFieldModule,
+    MatStepperModule,
+    MatCheckboxModule
+  ],
+  providers: [
+    {
+      provide: STEPPER_GLOBAL_OPTIONS,
+      useValue: {
+        displayDefaultIndicatorType: false
+      }
+    },
+    {
+      provide: MAT_FORM_FIELD_DEFAULT_OPTIONS,
+      useValue: {
+        subscriptSizing: 'dynamic'
+      }
+    }
   ],
   schemas: [CUSTOM_ELEMENTS_SCHEMA]
 })
diff --git a/apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.scss b/apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.scss
index dc9093b45..c43725e93 100644
--- a/apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.scss
+++ b/apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.scss
@@ -1,2 +1,14 @@
 :host {
+  .terms-and-conditions {
+    text-align: justify;
+
+    a {
+      color: rgba(var(--palette-primary-500), 1);
+      font-weight: 500;
+
+      &:hover {
+        color: rgba(var(--palette-primary-300), 1);
+      }
+    }
+  }
 }