diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 4eccbac7..5c61ad0d 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -6,11 +6,6 @@
 MISC ITEMS THAT CAME UP
 
 
-todo: telephone fields on entry forms need a control to trigger dialing
-	but check first with the docs and vuetify, if type is tel shouldn't it do it itself?
-todo: email fields on entry forms need a control to trigger emailing
-	same as above for tel
-
 
 todo: iPad view on map shows error about browser not allowing popups, however it does work so remove the error would be best
 
diff --git a/ayanova/src/api/ayanova-version.js b/ayanova/src/api/ayanova-version.js
index 97e19a4f..e4c84f62 100644
--- a/ayanova/src/api/ayanova-version.js
+++ b/ayanova/src/api/ayanova-version.js
@@ -1,4 +1,4 @@
 export default {
-  version: "8.0.0-alpha.93",
+  version: "8.0.0-alpha.94",
   copyright: "© 1999-2020, Ground Zero Tech-Works Inc."
 };
diff --git a/ayanova/src/views/adm-user.vue b/ayanova/src/views/adm-user.vue
index 9f7803cc..28683047 100644
--- a/ayanova/src/views/adm-user.vue
+++ b/ayanova/src/views/adm-user.vue
@@ -248,7 +248,7 @@
                 </v-col>
 
                 <v-col cols="12" sm="6" lg="4" xl="3">
-                  <v-text-field
+                  <gz-email
                     v-model="optionsObj.emailAddress"
                     :readonly="formState.readOnly"
                     :label="$ay.t('UserEmailAddress')"
@@ -256,8 +256,7 @@
                     ref="emailAddress"
                     @input="fieldValueChanged('emailAddress')"
                     data-cy="emailAddress"
-                    type="email"
-                  ></v-text-field>
+                  ></gz-email>
                 </v-col>
                 <v-col
                   v-if="form().showMe(this, 'Phone1')"
@@ -266,17 +265,16 @@
                   lg="4"
                   xl="3"
                 >
-                  <v-text-field
+                  <gz-phone
                     v-model="optionsObj.phone1"
                     :readonly="formState.readOnly"
                     :disabled="formState.readOnly"
                     :label="$ay.t('UserPhone1')"
                     ref="phone1"
                     data-cy="phone1"
-                    type="tel"
                     :error-messages="form().serverErrors(this, 'phone1')"
                     @input="fieldValueChanged('phone1')"
-                  ></v-text-field>
+                  ></gz-phone>
                 </v-col>
 
                 <v-col
@@ -286,17 +284,16 @@
                   lg="4"
                   xl="3"
                 >
-                  <v-text-field
+                  <gz-phone
                     v-model="optionsObj.phone2"
                     :readonly="formState.readOnly"
                     :disabled="formState.readOnly"
                     :label="$ay.t('UserPhone2')"
                     ref="phone2"
                     data-cy="phone2"
-                    type="tel"
                     :error-messages="form().serverErrors(this, 'phone2')"
                     @input="fieldValueChanged('phone2')"
-                  ></v-text-field>
+                  ></gz-phone>
                 </v-col>
 
                 <v-col
@@ -306,17 +303,16 @@
                   lg="4"
                   xl="3"
                 >
-                  <v-text-field
+                  <gz-phone
                     v-model="optionsObj.phone3"
                     :readonly="formState.readOnly"
                     :disabled="formState.readOnly"
                     :label="$ay.t('UserPageAddress')"
                     ref="phone3"
                     data-cy="phone3"
-                    type="tel"
                     :error-messages="form().serverErrors(this, 'phone3')"
                     @input="fieldValueChanged('phone3')"
-                  ></v-text-field>
+                  ></gz-phone>
                 </v-col>
 
                 <v-col cols="12" sm="6" lg="4" xl="3">
diff --git a/ayanova/src/views/cust-customer.vue b/ayanova/src/views/cust-customer.vue
index 7a33e21f..dcf85645 100644
--- a/ayanova/src/views/cust-customer.vue
+++ b/ayanova/src/views/cust-customer.vue
@@ -137,7 +137,7 @@
                     :disabled="formState.readOnly"
                     :label="$ay.t('CustomerPhone2')"
                     ref="phone2"
-                    data-cy="phone2"                   
+                    data-cy="phone2"
                     :error-messages="form().serverErrors(this, 'phone2')"
                     @input="fieldValueChanged('phone2')"
                   ></gz-phone>
diff --git a/ayanova/src/views/cust-user.vue b/ayanova/src/views/cust-user.vue
index c28d67f2..478e4c05 100644
--- a/ayanova/src/views/cust-user.vue
+++ b/ayanova/src/views/cust-user.vue
@@ -232,7 +232,7 @@
                 </v-col>
 
                 <v-col cols="12" sm="6" lg="4" xl="3">
-                  <v-text-field
+                  <gz-email
                     v-model="optionsObj.emailAddress"
                     :readonly="formState.readOnly"
                     :label="$ay.t('UserEmailAddress')"
@@ -240,8 +240,7 @@
                     ref="emailAddress"
                     @input="fieldValueChanged('emailAddress')"
                     data-cy="emailAddress"
-                    type="email"
-                  ></v-text-field>
+                  ></gz-email>
                 </v-col>
                 <v-col
                   v-if="form().showMe(this, 'Phone1')"
@@ -250,17 +249,16 @@
                   lg="4"
                   xl="3"
                 >
-                  <v-text-field
+                  <gz-phone
                     v-model="optionsObj.phone1"
                     :readonly="formState.readOnly"
                     :disabled="formState.readOnly"
                     :label="$ay.t('UserPhone1')"
                     ref="phone1"
                     data-cy="phone1"
-                    type="tel"
                     :error-messages="form().serverErrors(this, 'phone1')"
                     @input="fieldValueChanged('phone1')"
-                  ></v-text-field>
+                  ></gz-phone>
                 </v-col>
 
                 <v-col
@@ -270,17 +268,16 @@
                   lg="4"
                   xl="3"
                 >
-                  <v-text-field
+                  <gz-phone
                     v-model="optionsObj.phone2"
                     :readonly="formState.readOnly"
                     :disabled="formState.readOnly"
                     :label="$ay.t('UserPhone2')"
                     ref="phone2"
                     data-cy="phone2"
-                    type="tel"
                     :error-messages="form().serverErrors(this, 'phone2')"
                     @input="fieldValueChanged('phone2')"
-                  ></v-text-field>
+                  ></gz-phone>
                 </v-col>
 
                 <v-col
@@ -290,17 +287,16 @@
                   lg="4"
                   xl="3"
                 >
-                  <v-text-field
+                  <gz-phone
                     v-model="optionsObj.phone3"
                     :readonly="formState.readOnly"
                     :disabled="formState.readOnly"
                     :label="$ay.t('UserPageAddress')"
                     ref="phone3"
                     data-cy="phone3"
-                    type="tel"
                     :error-messages="form().serverErrors(this, 'phone3')"
                     @input="fieldValueChanged('phone3')"
-                  ></v-text-field>
+                  ></gz-phone>
                 </v-col>
 
                 <v-col cols="12" sm="6" lg="4" xl="3">
diff --git a/ayanova/src/views/home-user-settings.vue b/ayanova/src/views/home-user-settings.vue
index c0bbada7..b3a2f029 100644
--- a/ayanova/src/views/home-user-settings.vue
+++ b/ayanova/src/views/home-user-settings.vue
@@ -19,7 +19,7 @@
           </v-col>
 
           <v-col cols="12" sm="6" lg="4" xl="3">
-            <v-text-field
+            <gz-email
               v-model="obj.emailAddress"
               :readonly="formState.readOnly"
               :label="$ay.t('UserEmailAddress')"
@@ -27,8 +27,7 @@
               ref="emailAddress"
               @input="fieldValueChanged('emailAddress')"
               data-cy="emailAddress"
-              type="email"
-            ></v-text-field>
+            ></gz-email>
           </v-col>
           <v-col
             v-if="form().showMe(this, 'Phone1')"
@@ -37,17 +36,16 @@
             lg="4"
             xl="3"
           >
-            <v-text-field
+            <gz-phone
               v-model="obj.phone1"
               :readonly="formState.readOnly"
               :disabled="formState.readOnly"
               :label="$ay.t('UserPhone1')"
               ref="phone1"
               data-cy="phone1"
-              type="tel"
               :error-messages="form().serverErrors(this, 'phone1')"
               @input="fieldValueChanged('phone1')"
-            ></v-text-field>
+            ></gz-phone>
           </v-col>
 
           <v-col
@@ -57,17 +55,16 @@
             lg="4"
             xl="3"
           >
-            <v-text-field
+            <gz-phone
               v-model="obj.phone2"
               :readonly="formState.readOnly"
               :disabled="formState.readOnly"
               :label="$ay.t('UserPhone2')"
               ref="phone2"
               data-cy="phone2"
-              type="tel"
               :error-messages="form().serverErrors(this, 'phone2')"
               @input="fieldValueChanged('phone2')"
-            ></v-text-field>
+            ></gz-phone>
           </v-col>
 
           <v-col
@@ -77,17 +74,16 @@
             lg="4"
             xl="3"
           >
-            <v-text-field
+            <gz-phone
               v-model="obj.phone3"
               :readonly="formState.readOnly"
               :disabled="formState.readOnly"
               :label="$ay.t('UserPageAddress')"
               ref="phone3"
               data-cy="phone3"
-              type="tel"
               :error-messages="form().serverErrors(this, 'phone3')"
               @input="fieldValueChanged('phone3')"
-            ></v-text-field>
+            ></gz-phone>
           </v-col>
 
           <v-col cols="12" sm="6" lg="4" xl="3">
@@ -178,6 +174,7 @@
 </template>
 
 <script>
+import EmailControl from "../components/email-control.vue";
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////
 /*  Xeslint-disable    */
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -222,7 +219,7 @@ export default {
   beforeDestroy() {
     window.$gz.eventBus.$off("menu-click", clickHandler);
   },
-  components: {},
+  components: { EmailControl },
   data() {
     return {
       formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,