diff --git a/auth-web/package-lock.json b/auth-web/package-lock.json
index dcf6458fc2..8374e17e2f 100644
--- a/auth-web/package-lock.json
+++ b/auth-web/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "auth-web",
-  "version": "2.6.92",
+  "version": "2.6.93",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "auth-web",
-      "version": "2.6.92",
+      "version": "2.6.93",
       "dependencies": {
         "@bcrs-shared-components/base-address": "2.0.3",
         "@bcrs-shared-components/bread-crumb": "1.0.8",
diff --git a/auth-web/package.json b/auth-web/package.json
index 205386c878..6b2fbf58f4 100644
--- a/auth-web/package.json
+++ b/auth-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "auth-web",
-  "version": "2.6.92",
+  "version": "2.6.93",
   "appName": "Auth Web",
   "sbcName": "SBC Common Components",
   "private": true,
diff --git a/auth-web/src/components/pay/eft/ShortNameFinancialDialog.vue b/auth-web/src/components/pay/eft/ShortNameFinancialDialog.vue
index 26ca632cc1..18f0095157 100644
--- a/auth-web/src/components/pay/eft/ShortNameFinancialDialog.vue
+++ b/auth-web/src/components/pay/eft/ShortNameFinancialDialog.vue
@@ -49,7 +49,7 @@
             large
             color="primary"
             data-test="dialog-ok-button"
-            :disabled="isFormValid()"
+            :disabled="isFormInvalid()"
             @click="patchShortName()"
           >
             Save
@@ -84,7 +84,7 @@ export default defineComponent({
   },
   emits: ['on-patch', 'close-short-name-email-dialog'],
   setup (props, { emit }) {
-    const emailAddressRules = CommonUtils.emailRules()
+    const emailAddressRules = CommonUtils.emailRules(true)
     const modalDialog: Ref<InstanceType<typeof ModalDialog>> = ref(null)
     const accountLinkingErrorDialog: Ref<InstanceType<typeof ModalDialog>> = ref(null)
     const state = reactive<any>({
@@ -94,13 +94,13 @@ export default defineComponent({
       isDialogTypeCasSupplierNumber: computed(() => props.shortNameFinancialDialogType === 'CAS_SUPPLIER_NUMBER')
     })
 
-    function isFormValid () {
+    function isFormInvalid () {
       if (state.isDialogTypeEmail) {
-        return emailAddressRules.every(rule => rule(state.email) !== true)
+        return !state.email || emailAddressRules.some(rule => rule(state.email) !== true)
       } else if (state.isDialogTypeCasSupplierNumber) {
         return !state.casSupplierNumber
       }
-      return false
+      return true
     }
 
     function openAccountLinkingDialog (item: EFTShortnameResponse, dialogType) {
@@ -158,7 +158,7 @@ export default defineComponent({
       patchShortName,
       emailAddressRules,
       dialogTitle,
-      isFormValid
+      isFormInvalid
     }
   }
 })
diff --git a/auth-web/src/views/pay/eft/ShortNameDetailsView.vue b/auth-web/src/views/pay/eft/ShortNameDetailsView.vue
index 0302f25b50..0258641861 100644
--- a/auth-web/src/views/pay/eft/ShortNameDetailsView.vue
+++ b/auth-web/src/views/pay/eft/ShortNameDetailsView.vue
@@ -16,7 +16,7 @@
         <h1 class="view-header__title">
           {{ shortNameDetails.shortName }}
         </h1>
-        <p class="mt-6 mb-0">
+        <p class="mt-3 mb-0 unsettled-amount">
           <span class="font-weight-bold">Unsettled Amount: </span>{{ unsettledAmount }}
         </p>
       </div>
@@ -29,29 +29,29 @@
           <span class="font-weight-bold">CAS Supplier Number: </span>
           {{ shortName.casSupplierNumber || 'N/A' }}
           <span
-            class="primary--text cursor-pointer"
+            class="pl-4 primary--text cursor-pointer"
             data-test="btn-edit"
             @click="openShortNameSupplierNumberDialog()"
           >
             <v-icon
               color="primary"
               size="20"
-            > mdi-pencil</v-icon>
+            > mdi-pencil-outline</v-icon>
             Edit
           </span>
         </div>
         <div class="overflow-wrap">
           <span class="font-weight-bold">Email: </span>
-          {{ shortName.email || 'N/A' }}
+          <span class="email">{{ shortName.email || 'N/A' }}</span>
           <span
-            class="primary--text cursor-pointer"
+            class="pl-4 primary--text cursor-pointer"
             data-test="btn-edit"
             @click="openShortNameEmailDialog()"
           >
             <v-icon
               color="primary"
               size="20"
-            > mdi-pencil</v-icon>
+            > mdi-pencil-outline</v-icon>
             Edit
           </span>
         </div>
@@ -240,6 +240,20 @@ export default defineComponent({
 
 <style lang="scss" scoped>
 @import '@/assets/scss/theme.scss';
+  .email {
+    word-wrap: break-word;
+    word-break: break-all;
+  }
+  .view-header__title {
+    font-size: 24px;
+    line-height: 32px;
+  }
+  .unsettled-amount {
+    font-size: 18px;
+  }
+  .shortname-info {
+    font-size: 18px;
+  }
   #shortname-details {
     padding-top: 0;
   }
@@ -265,7 +279,7 @@ export default defineComponent({
       flex: 1 1 100%;
     }
     .shortname-info {
-      flex: 0 0 320px;
+      flex: 0 0 380px;
     }
     &:after {
       content: '';