diff --git a/src/modules/10_registry/01_Information/01_Information.vue b/src/modules/10_registry/01_Information/01_Information.vue
index 9e30df3..89372f8 100644
--- a/src/modules/10_registry/01_Information/01_Information.vue
+++ b/src/modules/10_registry/01_Information/01_Information.vue
@@ -351,7 +351,7 @@ async function onSavePhone() {
             getData();
           });
       },
-      "ยืนยันการแก้ไขเบอร์โทร"
+      "ยืนยันการแก้ไขเบอร์โทร",
     );
   }
 }
@@ -381,7 +381,7 @@ async function onSaveEmail() {
           })
           .finally(() => {});
       },
-      "ยืนยันการแก้ไขอีเมล"
+      "ยืนยันการแก้ไขอีเมล",
     );
   }
 }
@@ -588,7 +588,18 @@ onMounted(async () => {
             </div>
           </div>
           <div class="row">
-            <div class="col-4 text-grey-6 text-weight-medium">อีเมล</div>
+            <div class="col-4 text-grey-6 text-weight-medium">
+              อีเมล
+
+              <q-icon
+                if="emailVerify == 'NOT_VERIFIED'"
+                name="mdi-alert-box"
+                color="warning"
+                size="sm"
+              >
+                <q-tooltip>รอยืนยันอีเมล</q-tooltip>
+              </q-icon>
+            </div>
             <div class="col-8">
               <div class="row q-col-gutter-sm">
                 <div class="col-9">
@@ -606,62 +617,50 @@ onMounted(async () => {
                     @change="isValidEmail = true"
                   />
                 </div>
-                <div v-if="emailVerify == null" class="self-center col-3">
-                  <div v-if="editEmail == false">
-                    <q-btn
-                      dense
-                      flat
-                      round
-                      icon="edit"
-                      color="edit"
-                      @click="() => (editEmail = true)"
-                    >
-                      <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-                    </q-btn>
-                  </div>
-                  <div v-else class="self-center">
-                    <q-btn
-                      :disable="isCheckEmail"
-                      :color="isCheckEmail ? 'grey-6' : 'primary'"
-                      dense
-                      flat
-                      round
-                      icon="save"
-                      @click="onSaveEmail"
-                    >
-                      <q-tooltip>บันทึก</q-tooltip>
-                    </q-btn>
-                    <q-btn
-                      dense
-                      flat
-                      round
-                      icon="undo"
-                      color="red"
-                      @click="
-                        () => {
-                          editEmail = false;
-                          formDataInformation.email = email;
-                          isValidEmail = true;
-                        }
-                      "
-                    >
-                      <q-tooltip>ยกเลิก</q-tooltip>
-                    </q-btn>
-                  </div>
-                </div>
-                <div
-                  v-else-if="emailVerify == 'NOT_VERIFIED'"
-                  class="self-center col-3"
-                >
-                  <q-icon
-                    name="mdi-alert-box"
-                    color="warning"
-                    size="sm"
-                    class="selft-center"
+
+                <!-- <div v-if="emailVerify == null" class="self-center col-3"> -->
+                <div v-if="editEmail == false">
+                  <q-btn
+                    dense
+                    flat
+                    round
+                    icon="edit"
+                    color="edit"
+                    @click="() => (editEmail = true)"
                   >
-                    <q-tooltip>รอยืนยันอีเมล</q-tooltip>
-                  </q-icon>
+                    <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+                  </q-btn>
                 </div>
+                <div v-else class="self-center">
+                  <q-btn
+                    :disable="isCheckEmail"
+                    :color="isCheckEmail ? 'grey-6' : 'primary'"
+                    dense
+                    flat
+                    round
+                    icon="save"
+                    @click="onSaveEmail"
+                  >
+                    <q-tooltip>บันทึก</q-tooltip>
+                  </q-btn>
+                  <q-btn
+                    dense
+                    flat
+                    round
+                    icon="undo"
+                    color="red"
+                    @click="
+                      () => {
+                        editEmail = false;
+                        formDataInformation.email = email;
+                        isValidEmail = true;
+                      }
+                    "
+                  >
+                    <q-tooltip>ยกเลิก</q-tooltip>
+                  </q-btn>
+                </div>
+                <!-- </div> -->
               </div>
             </div>
           </div>