diff --git a/src/views/Register.vue b/src/views/Register.vue
index 14f37eb..9ce0491 100644
--- a/src/views/Register.vue
+++ b/src/views/Register.vue
@@ -15,7 +15,7 @@
             </div>
             <div class="mb-3">
               <label for="password">Password Confirmation: </label>
-              <input type="passwordConfirm" id="passwordConfirm" v-model="input.passwordConfirm" />
+              <input type="password" id="passwordConfirm" v-model="input.passwordConfirm" />
             </div>
             
           </v-form>
@@ -29,7 +29,6 @@
   </template>
   
   <script>
-  // mango : i have a problem with css due to the icon theme so i make some mock up to testing login/register
   import TopBar from '@/components/TopBar.vue';
   
   export default {
@@ -39,7 +38,7 @@
     name: 'register',
     data() {
       return {
-        pageTitle: 'สมัครสมาชิค', // Set the page title here
+        pageTitle: 'สมัครสมาชิค', 
         input: {
           username: '',
           password: '',
@@ -49,7 +48,6 @@
     },
     methods: {
       login() {
-        // Make sure username OR password are not empty
         if (this.input.username !== '' || this.input.password !== '') {
           console.log('Authenticated: Checking with Backend');
         } else {
diff --git a/src/views/Setting.vue b/src/views/Setting.vue
index 190e492..a652aa6 100644
--- a/src/views/Setting.vue
+++ b/src/views/Setting.vue
@@ -2,8 +2,8 @@
 <v-app>
     <v-container class="d-flex justify-center align-center">
         <div>
-            <h1>Heading</h1>
-        <h2>Sub-Heading</h2>
+            <h1>ยังไม่ได้ลงชื่อเข้าใช้</h1>
+        <h2>ลงชื่อเข้าใช้เพื่อบันทึกการตั้งค่าอย่างปลอดภัย</h2>
       <v-container class="d-flex justify-center align-center">
         <v-btn class="ma-2" width="150" :to="{name: 'login'}">ลงชื่อเข้าใช้</v-btn>
         <v-btn class="ma-2" width="150" :to="{name: 'register'}">สมัครสมาชิค</v-btn>