diff --git a/ayanova/package.json b/ayanova/package.json
index a4f14672..e520b105 100644
--- a/ayanova/package.json
+++ b/ayanova/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ayanova",
-  "version": "8.0.6",
+  "version": "8.0.7",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
diff --git a/ayanova/src/api/ayanova-version.js b/ayanova/src/api/ayanova-version.js
index 2d939e61..9ef44e9d 100644
--- a/ayanova/src/api/ayanova-version.js
+++ b/ayanova/src/api/ayanova-version.js
@@ -1,4 +1,4 @@
 export default {
-  version: "8.0.6",
+  version: "8.0.7",
   copyright: "© 1999-2022, Ground Zero Tech-Works Inc."
 };
diff --git a/ayanova/src/views/adm-user.vue b/ayanova/src/views/adm-user.vue
index b936a210..95ab00ce 100644
--- a/ayanova/src/views/adm-user.vue
+++ b/ayanova/src/views/adm-user.vue
@@ -86,8 +86,19 @@
                     @input="fieldValueChanged('usertype')"
                   ></v-select>
                 </v-col>
-
                 <v-col cols="12" sm="6" lg="4" xl="3">
+                  <v-checkbox
+                    ref="allowLogin"
+                    v-model="obj.allowLogin"
+                    :readonly="formState.readOnly"
+                    :disabled="obj.id === 1"
+                    :label="$ay.t('AllowLogin')"
+                    data-cy="allowLogin"
+                    :error-messages="form().serverErrors(this, 'allowLogin')"
+                    @change="fieldValueChanged('allowLogin')"
+                  ></v-checkbox>
+                </v-col>
+                <v-col v-if="obj.allowLogin" cols="12" sm="6" lg="4" xl="3">
                   <v-text-field
                     id="username"
                     ref="login"
@@ -105,7 +116,7 @@
                   ></v-text-field>
                 </v-col>
 
-                <v-col cols="12" sm="6" lg="4" xl="3">
+                <v-col v-if="obj.allowLogin" cols="12" sm="6" lg="4" xl="3">
                   <v-text-field
                     id="password"
                     ref="password"
@@ -419,6 +430,7 @@ export default {
         id: 0,
         concurrency: 0,
         active: true,
+        allowLogin: true,
         name: null,
         roles: null,
         userType: 2,
@@ -1081,7 +1093,8 @@ async function fetchTranslatedText() {
     "AuthDisableTwoFactor",
     "AuthTwoFactorDisabled",
     "WorkOrderItemScheduledUserList",
-    "WorkOrderItemLaborList"
+    "WorkOrderItemLaborList",
+    "AllowLogin"
   ]);
 }
 
diff --git a/ayanova/src/views/cust-user.vue b/ayanova/src/views/cust-user.vue
index 73546231..69734e22 100644
--- a/ayanova/src/views/cust-user.vue
+++ b/ayanova/src/views/cust-user.vue
@@ -83,6 +83,19 @@
                 </v-col>
 
                 <v-col cols="12" sm="6" lg="4" xl="3">
+                  <v-checkbox
+                    ref="allowLogin"
+                    v-model="obj.allowLogin"
+                    :readonly="formState.readOnly"
+                    :disabled="obj.id === 1"
+                    :label="$ay.t('AllowLogin')"
+                    data-cy="allowLogin"
+                    :error-messages="form().serverErrors(this, 'allowLogin')"
+                    @change="fieldValueChanged('allowLogin')"
+                  ></v-checkbox>
+                </v-col>
+
+                <v-col v-if="obj.allowLogin" cols="12" sm="6" lg="4" xl="3">
                   <v-text-field
                     id="username"
                     ref="login"
@@ -100,7 +113,7 @@
                   ></v-text-field>
                 </v-col>
 
-                <v-col cols="12" sm="6" lg="4" xl="3">
+                <v-col v-if="obj.allowLogin" cols="12" sm="6" lg="4" xl="3">
                   <v-text-field
                     id="password"
                     ref="password"
@@ -116,6 +129,7 @@
                     @click:append-outer="reveal = !reveal"
                   ></v-text-field>
                 </v-col>
+                
                 <v-col cols="12" sm="6" lg="4" xl="3">
                   <gz-date-time-picker
                     ref="lastLogin"
@@ -408,6 +422,7 @@ export default {
         id: 0,
         concurrency: 0,
         active: true,
+        allowLogin: false,
         name: null,
         roles: 2048,
         userType: 3,
@@ -1033,7 +1048,8 @@ async function fetchTranslatedText() {
     "UserPageAddress",
     "SendPasswordResetCode",
     "AuthDisableTwoFactor",
-    "AuthTwoFactorDisabled"
+    "AuthTwoFactorDisabled",
+    "AllowLogin"
   ]);
 }