diff --git a/src/components/modals/admin/UserForm.vue b/src/components/modals/admin/UserForm.vue
index 27bba51..6581add 100644
--- a/src/components/modals/admin/UserForm.vue
+++ b/src/components/modals/admin/UserForm.vue
@@ -9,19 +9,46 @@
       <q-card-section class="row">
         <div class="col-2">Username:</div>
         <div class="col-10">
-          <q-input outlined dense v-model="username" :rules="[ val => !!val || '*Required']" />
+          <q-input
+            outlined
+            dense
+            v-model="username"
+            :rules="[ val => !!val || '*Required']"
+            class="q-pa-none"
+          />
         </div>
       </q-card-section>
       <q-card-section class="row" v-if="!this.pk">
         <div class="col-2">Password:</div>
         <div class="col-10">
-          <q-input outlined dense v-model="password" :rules="[ val => !!val || '*Required']" />
+          <q-input
+            outlined
+            dense
+            v-model="password"
+            :type="isPwd ? 'password' : 'text'"
+            :rules="[ val => !!val || '*Required']"
+            class="q-pa-none"
+          >
+            <template v-slot:append>
+              <q-icon
+                :name="isPwd ? 'visibility_off' : 'visibility'"
+                class="cursor-pointer"
+                @click="isPwd = !isPwd"
+              />
+            </template>
+          </q-input>
         </div>
       </q-card-section>
       <q-card-section class="row">
         <div class="col-2">Email:</div>
         <div class="col-10">
-          <q-input outlined dense v-model="email" :rules="[ val => !!val || '*Required']" />
+          <q-input
+            outlined
+            dense
+            v-model="email"
+            :rules="[val => isValidEmail(val) || 'Invalid email']"
+            class="q-pa-none"
+          />
         </div>
       </q-card-section>
       <q-card-section class="row">
@@ -63,13 +90,14 @@ export default {
       email: "",
       first_name: "",
       last_name: "",
-      is_active: true
+      is_active: true,
+      isPwd: true,
     };
   },
   computed: {
     title() {
       return this.pk ? "Edit User" : "Add User";
-    }
+    },
   },
   methods: {
     getUser() {
@@ -94,7 +122,7 @@ export default {
         email: this.email,
         is_active: this.is_active,
         first_name: this.first_name,
-        last_name: this.last_name
+        last_name: this.last_name,
       };
 
       if (this.pk) {
@@ -110,8 +138,7 @@ export default {
             this.$q.notify(notifyErrorConfig(e.response.data));
           });
       } else {
-
-        formData.password = this.password
+        formData.password = this.password;
 
         this.$store
           .dispatch("admin/addUser", formData)
@@ -125,13 +152,13 @@ export default {
             this.$q.notify(notifyErrorConfig(e.response.data));
           });
       }
-    }
+    },
   },
   mounted() {
     // If pk prop is set that means we are editting
     if (this.pk) {
       this.getUser();
     }
-  }
+  },
 };
 </script>
\ No newline at end of file
diff --git a/src/components/modals/coresettings/EditCoreSettings.vue b/src/components/modals/coresettings/EditCoreSettings.vue
index e7bc258..5c4e4fd 100644
--- a/src/components/modals/coresettings/EditCoreSettings.vue
+++ b/src/components/modals/coresettings/EditCoreSettings.vue
@@ -240,10 +240,6 @@ export default {
       const removed = this.settings.email_alert_recipients.filter(k => k !== email);
       this.settings.email_alert_recipients = removed;
     },
-    isValidEmail(val) {
-      const email = /^(?=[a-zA-Z0-9@._%+-]{6,254}$)[a-zA-Z0-9._%+-]{1,64}@(?:[a-zA-Z0-9-]{1,63}\.){1,8}[a-zA-Z]{2,63}$/;
-      return email.test(val);
-    },
     editSettings() {
       this.$q.loading.show();
       axios
diff --git a/src/mixins/mixins.js b/src/mixins/mixins.js
index d30c542..e8f6ea6 100644
--- a/src/mixins/mixins.js
+++ b/src/mixins/mixins.js
@@ -62,7 +62,7 @@ export default {
       return getTimeLapse(unixtime);
     },
     alertTime(datetime) {
-      return getTimeLapse(Date.parse(datetime)/1000);
+      return getTimeLapse(Date.parse(datetime) / 1000);
 
     },
     notifySuccess(msg, timeout = 2000) {
@@ -76,6 +76,10 @@ export default {
     },
     notifyInfo(msg, timeout = 2000) {
       Notify.create(notifyInfoConfig(msg, timeout));
-    }
+    },
+    isValidEmail(val) {
+      const email = /^(?=[a-zA-Z0-9@._%+-]{6,254}$)[a-zA-Z0-9._%+-]{1,64}@(?:[a-zA-Z0-9-]{1,63}\.){1,8}[a-zA-Z]{2,63}$/;
+      return email.test(val);
+    },
   }
 };