diff --git a/ayanova/src/views/adm-user.vue b/ayanova/src/views/adm-user.vue
index 66f0e11f..eff6b59a 100644
--- a/ayanova/src/views/adm-user.vue
+++ b/ayanova/src/views/adm-user.vue
@@ -457,7 +457,9 @@
               color="blue darken-1"
               text
               :disabled="
-                subject == null || message == null || obj.emailAddress == null
+                subject == null ||
+                  message == null ||
+                  optionsObj.emailAddress == null
               "
               @click="sendEmail()"
               >{{ $ay.t("OK") }}</v-btn
@@ -638,7 +640,7 @@ export default {
         this.obj.id == 0 ||
         this.subject == null ||
         this.message == null ||
-        window.$gz.util.stringIsNullOrEmpty(this.obj.emailAddress)
+        window.$gz.util.stringIsNullOrEmpty(this.optionsObj.emailAddress)
       ) {
         return;
       }
@@ -647,7 +649,7 @@ export default {
         const res = await window.$gz.api.upsert("notify/direct-smtp", {
           ObjectId: this.obj.id,
           aType: this.ayaType,
-          toAddress: this.obj.emailAddress,
+          toAddress: this.optionsObj.emailAddress,
           subject: this.subject,
           textBody: this.message
         });
@@ -1127,7 +1129,7 @@ function generateMenu(vm) {
   if (
     vm.rights.change &&
     vm.$route.params.recordid != 0 &&
-    !window.$gz.util.stringIsNullOrEmpty(vm.obj.emailAddress)
+    !window.$gz.util.stringIsNullOrEmpty(vm.optionsObj.emailAddress)
   ) {
     menuOptions.menuItems.push({
       title: "SendEmail",
diff --git a/ayanova/src/views/cust-user.vue b/ayanova/src/views/cust-user.vue
index aaa282ba..7ef11ccd 100644
--- a/ayanova/src/views/cust-user.vue
+++ b/ayanova/src/views/cust-user.vue
@@ -448,7 +448,9 @@
               color="blue darken-1"
               text
               :disabled="
-                subject == null || message == null || obj.emailAddress == null
+                subject == null ||
+                  message == null ||
+                  optionsObj.emailAddress == null
               "
               @click="sendEmail()"
               >{{ $ay.t("OK") }}</v-btn
@@ -641,7 +643,7 @@ export default {
         this.obj.id == 0 ||
         this.subject == null ||
         this.message == null ||
-        window.$gz.util.stringIsNullOrEmpty(this.obj.emailAddress)
+        window.$gz.util.stringIsNullOrEmpty(this.optionsObj.emailAddress)
       ) {
         return;
       }
@@ -650,7 +652,7 @@ export default {
         const res = await window.$gz.api.upsert("notify/direct-smtp", {
           ObjectId: this.obj.id,
           aType: this.ayaType,
-          toAddress: this.obj.emailAddress,
+          toAddress: this.optionsObj.emailAddress,
           subject: this.subject,
           textBody: this.message
         });
@@ -1084,7 +1086,7 @@ function generateMenu(vm) {
   if (
     vm.rights.change &&
     vm.$route.params.recordid != 0 &&
-    !window.$gz.util.stringIsNullOrEmpty(vm.obj.emailAddress)
+    !window.$gz.util.stringIsNullOrEmpty(vm.optionsObj.emailAddress)
   ) {
     menuOptions.menuItems.push({
       title: "SendEmail",