diff --git a/webpack/vue/noauth/login.vue b/webpack/vue/noauth/login.vue
index 1991f3f..9b1b04c 100644
--- a/webpack/vue/noauth/login.vue
+++ b/webpack/vue/noauth/login.vue
@@ -6,13 +6,13 @@
 
 		<div class='form'>
 			<h3>Welcome back!</h3>
-			<label for='email'>EMAIL</label>
-			<input type='text' name='email' class='flat'>
-			<label for='password'>PASSWORD</label>
-			<input type='password' name='password' class='flat'>
-			<label for='fpass' class='link'>FORGOT YOUR PASSWORD ?</label>
+			<label for='username' :class='gs.login.username.error.length<1?``:`err`'>USERNAME <span>{{ gs.login.username.error }}</span></label>
+			<input type='text' name='username' v-model='gs.login.username.model' class='flat' autofocus>
+			<label for='password' :class='gs.login.password.error.length<1?``:`err`'>PASSWORD <span>{{ gs.login.password.error }}</span></label>
+			<input type='password' name='password' v-model='gs.login.password.model' class='flat'>
+			<!-- <label for='fpass' class='link' @click='gs.login.func.forgot_pass()'>FORGOT YOUR PASSWORD ?</label> -->
 
-			<button class='submit'>Login</button>
+			<button class='submit' @click='gs.login.func.login()'>Login</button>
 			<span>Need an account? <router-link to='register'>Register</router-link></span>
 		</div>
 
diff --git a/webpack/vue/noauth/register.vue b/webpack/vue/noauth/register.vue
index 434e6dc..820c086 100644
--- a/webpack/vue/noauth/register.vue
+++ b/webpack/vue/noauth/register.vue
@@ -7,7 +7,7 @@
 		<div class='form'>
 			<h3>Create an account</h3>
 			<label for='email'>EMAIL</label>
-			<input type='text' name='email' class='flat'>
+			<input type='email' name='email' class='flat' autofocus>
 			<label for='username'>USERNAME</label>
 			<input type='text' name='username' class='flat'>
 			<label for='password'>PASSWORD</label>