diff --git a/apps/web/src/app/auth/remove-password.component.html b/apps/web/src/app/auth/remove-password.component.html
index f8d2b26fc17..3749d4050a4 100644
--- a/apps/web/src/app/auth/remove-password.component.html
+++ b/apps/web/src/app/auth/remove-password.component.html
@@ -14,7 +14,7 @@
     bitButton
     type="button"
     buttonType="primary"
-    class="tw-w-full"
+    class="tw-w-full tw-mb-2"
     [bitAction]="convert"
     [block]="true"
   >
diff --git a/libs/angular/src/auth/components/remove-password.component.ts b/libs/angular/src/auth/components/remove-password.component.ts
index ddd494e31a3..ad5027734c8 100644
--- a/libs/angular/src/auth/components/remove-password.component.ts
+++ b/libs/angular/src/auth/components/remove-password.component.ts
@@ -41,7 +41,7 @@ export class RemovePasswordComponent implements OnInit {
     this.loading = false;
   }
 
-  async convert() {
+  convert = async () => {
     this.continuing = true;
     this.actionPromise = this.keyConnectorService.migrateUser();
 
@@ -59,9 +59,9 @@ export class RemovePasswordComponent implements OnInit {
     } catch (e) {
       this.platformUtilsService.showToast("error", this.i18nService.t("errorOccurred"), e.message);
     }
-  }
+  };
 
-  async leave() {
+  leave = async () => {
     const confirmed = await this.dialogService.openSimpleDialog({
       title: this.organization.name,
       content: { key: "leaveOrganizationConfirmation" },
@@ -84,5 +84,5 @@ export class RemovePasswordComponent implements OnInit {
     } catch (e) {
       this.platformUtilsService.showToast("error", this.i18nService.t("errorOccurred"), e);
     }
-  }
+  };
 }