diff --git a/src/modules/10_registry/01_Information/01_Information.vue b/src/modules/10_registry/01_Information/01_Information.vue
index 51c6b64..85bd129 100644
--- a/src/modules/10_registry/01_Information/01_Information.vue
+++ b/src/modules/10_registry/01_Information/01_Information.vue
@@ -250,6 +250,7 @@ function getData() {
       formDataInformation.religion = data.religion;
       formDataInformation.bloodGroup = data.bloodGroup;
       formDataInformation.phone = data.phone;
+      formDataInformation.email = data.email.split("@")[0];
     })
     .catch((e) => {
       messageError($q, e);
@@ -441,21 +442,22 @@ onMounted(() => {
             </div>
           </div>
           <div class="row">
-            <div class="col-4 text-grey-6 text-weight-medium">เบอร์โทร</div>
-            <div class="col-8">
-              <div class="row q-gutter-sm">
-                <q-input
-                  dense
-                  outlined
-                  v-model="formDataInformation.phone"
-                  :readonly="!editPhone"
-                  mask="##########"
-                  style="width: 300px"
-                  :class="editPhone ? 'inputgreen' : ''"
-                >
-                </q-input>
+            <div class="col-5 text-grey-6 text-weight-medium">เบอร์โทร</div>
+            <div class="col-7">
+              <div class="row q-col-gutter-sm">
+                <div class="col-9">
+                  <q-input
+                    dense
+                    outlined
+                    v-model="formDataInformation.phone"
+                    :readonly="!editPhone"
+                    mask="##########"
+                    :class="editPhone ? 'inputgreen' : ''"
+                  >
+                  </q-input>
+                </div>
 
-                <div v-if="editPhone == false" class="self-center">
+                <div v-if="editPhone == false" class="self-center col-3">
                   <q-btn
                     dense
                     flat
@@ -467,7 +469,7 @@ onMounted(() => {
                     <q-tooltip>แก้ไข</q-tooltip>
                   </q-btn>
                 </div>
-                <div v-else class="self-center">
+                <div v-else class="self-center col-3">
                   <q-btn
                     dense
                     flat
@@ -493,23 +495,24 @@ onMounted(() => {
             </div>
           </div>
           <div class="row">
-            <div class="col-4 text-grey-6 text-weight-medium">อีเมล</div>
-            <div class="col-8">
-              <div class="row no-wrap q-gutter-sm">
-                <q-input
-                  dense
-                  outlined
-                  v-model="formDataInformation.email"
-                  :readonly="!editEmail"
-                  type="email"
-                  suffix="@bangkok.go.th"
-                  style="width: 300px"
-                  :class="editEmail ? 'inputgreen' : ''"
-                >
-                </q-input>
+            <div class="col-5 text-grey-6 text-weight-medium">อีเมล</div>
+            <div class="col-7">
+              <div class="row q-col-gutter-sm">
+                <div class="col-9">
+                  <q-input
+                    dense
+                    outlined
+                    v-model="formDataInformation.email"
+                    :readonly="!editEmail"
+                    type="email"
+                    suffix="@bangkok.go.th"
+                    :class="editEmail ? 'inputgreen' : ''"
+                  >
+                  </q-input>
+                </div>
                 <div
                   v-if="emailVerify == null || emailVerify == true"
-                  class="self-center"
+                  class="self-center col-3"
                 >
                   <div v-if="editEmail == false">
                     <q-btn
@@ -546,7 +549,7 @@ onMounted(() => {
                     </q-btn>
                   </div>
                 </div>
-                <div v-else class="self-center">
+                <div v-else class="self-center col-3">
                   <q-icon
                     name="mdi-alert-box"
                     color="warning"