diff --git a/ayanova/src/views/home-security.vue b/ayanova/src/views/home-security.vue
index 0aa20db2..c420f0ba 100644
--- a/ayanova/src/views/home-security.vue
+++ b/ayanova/src/views/home-security.vue
@@ -5,7 +5,9 @@
         <v-row>
           <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
           <template v-if="tfaEnabled">
-            DISABLE TFA
+            <v-btn color="accent" text @click="disable()">{{
+              $ay.t("AuthDisableTwoFactor")
+            }}</v-btn>
           </template>
           <template v-else>
             <v-col cols="12">
@@ -153,7 +155,39 @@ export default {
         window.$gz.form.fieldValueChanged(this, ref);
       }
     },
+    async disable() {
+      let vm = this;
 
+      vm.formState.loading = true;
+
+      //clear any errors vm might be around from previous submit
+      window.$gz.form.deleteAllErrorBoxErrors(vm);
+      try {
+        let res = await window.$gz.api.post("auth/totp-disable", {
+          pin: vm.pin
+        });
+
+        if (res.error) {
+          vm.formState.serverError = res.error;
+          window.$gz.form.setErrorBoxErrors(vm);
+        } else {
+          await window.$gz.dialog.displayLTModalNotificationMessage(
+            "AuthTwoFactorDisabled"
+          );
+          vm.$router.push("/home-user-settings");
+
+          //Only a post, no data returned
+          window.$gz.form.setFormState({
+            vm: vm,
+            dirty: false
+          });
+        }
+      } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, vm);
+      } finally {
+        vm.loading = false;
+      }
+    },
     async authenticate() {
       let vm = this;
 
@@ -170,7 +204,19 @@ export default {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          console.log(res);
+          if (res.data.ok == true) {
+            //all ok, 2fa enabled
+            await window.$gz.dialog.displayLTModalNotificationMessage(
+              "AuthConnectCompleted"
+            );
+            vm.$router.push("/home-user-settings");
+          } else {
+            window.$gz.eventBus.$emit(
+              "notify-warning",
+              this.$ay.t("AuthPinInvalid")
+            );
+          }
+
           //Only a post, no data returned
           window.$gz.form.setFormState({
             vm: vm,
@@ -256,7 +302,9 @@ async function fetchTranslatedText(vm) {
     "AuthEnterPin",
     "AuthTwoFactor",
     "AuthPinInvalid",
-    "AuthConnectCompleted"
+    "AuthConnectCompleted",
+    "AuthDisableTwoFactor",
+    "AuthTwoFactorDisabled"
   ]);
 }
 </script>