diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index e86685b1..95881ae5 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -46,7 +46,6 @@ class RegisterController extends Controller
     protected function validator(array $data)
     {
         return Validator::make($data, [
-            'name' => 'required|name|max:255',
             'marking' => 'required|max:255|unique:markings',
             'email' => 'required|email|max:255|unique:users',
             'password' => 'required|min:6|confirmed',
@@ -61,6 +60,11 @@ class RegisterController extends Controller
      */
     protected function create(Request $data)
     {
+        $this->validate($data, [
+            'email' => 'required|email|max:255|unique:users',
+            'password' => 'required|min:6|confirmed',
+        ]);
+
         $marking = Marking::Where('email',$data['email'])->first();
 
         if(!$marking){
diff --git a/resources/assets/js/pages/auth/register.vue b/resources/assets/js/pages/auth/register.vue
index dc4dccd2..2e236c85 100644
--- a/resources/assets/js/pages/auth/register.vue
+++ b/resources/assets/js/pages/auth/register.vue
@@ -5,65 +5,65 @@
 				<card :title="$t('register')">
 					<form @submit.prevent="register" @keydown="form.onKeydown($event)">
 						<!-- Marking -->
-						<div class="form-group row" :class="{'has-error': errors.has('marking') }">
+						<div class="form-group row">
 							<label class="col-md-3 col-form-label text-md-right">{{ $t('Marking') }}</label>
 							<div class="col-md-7">
-								<el-input v-model="form.marking" v-validate="'required|max:255'" type="text" name="marking" placeholder="Marking Number">
+								<el-input v-model="form.marking" :class="{ 'is-invalid': form.errors.has('marking') }" type="text" name="marking" placeholder="Marking Number">
 								</el-input>
-								<span class="text-danger" v-if="errors.has('marking')">{{ errors.first('marking') }}<br/></span>
+								<has-error :form="form" field="marking"/>
 							</div>
 						</div>
 
 						<!-- Email -->
-						<div class="form-group row" :class="{'has-error': errors.has('email') }">
+						<div class="form-group row">
 							<label class="col-md-3 col-form-label text-md-right">{{ $t('email') }}</label>
 							<div class="col-md-7">
-								<el-input v-model="form.email" v-validate="'required|max:255'" type="email" name="email" placeholder="Email">
+								<el-input v-model="form.email" type="email" name="email" placeholder="Email">
 								</el-input>
-								<span class="text-danger" v-if="errors.has('email')">{{ errors.first('email') }}</span>
+								<has-error :form="form" field="email"/>
 							</div>
 						</div>
 
 						<!-- Password -->
-						<div class="form-group row" :class="{'has-error': errors.has('password') }">
+						<div class="form-group row">
 							<label class="col-md-3 col-form-label text-md-right">{{ $t('password') }}</label>
 							<div class="col-md-7">
-								<el-input v-if="password_visible" v-model="form.password" v-validate="'required|min:6|max:255'" type="text" name="password" placeholder="Password">
+								<el-input v-if="password_visible" v-model="form.password"  type="text" name="password" placeholder="Password">
 									<template slot="append">
 										<el-button type="primary" @click="password_visible = !password_visible"><i class="fas fa-eye"></i></el-button>
 									</template>
 								</el-input>
-								<el-input v-else v-model="form.password" v-validate="'required|min:6|max:255'" type="password" name="password" placeholder="Password">
+								<el-input v-else v-model="form.password"  type="password" name="password" placeholder="Password">
 									<template slot="append">
 										<el-button type="primary" @click="password_visible = !password_visible"><i class="fas fa-eye-slash"></i></el-button>
 									</template>
 								</el-input>
-								<span class="text-danger" v-if="errors.has('password')">{{ errors.first('password') }}</span>
+								<has-error :form="form" field="password"/>
 							</div>
 						</div>
 
 						<!-- Password Confirmation -->
-						<div class="form-group row" :class="{'has-error': errors.has('confirm_password') }">
+						<div class="form-group row">
 							<label class="col-md-3 col-form-label text-md-right">{{ $t('confirm_password') }}</label>
 							<div class="col-md-7">
-								<el-input v-if="password_confirmation_visible" v-model="form.password_confirmation" v-validate="'required|min:6|max:255'" type="text" name="password_confirmation" placeholder="Confirm Password">
+								<el-input v-if="password_confirmation_visible" v-model="form.password_confirmation" type="text" name="password_confirmation" placeholder="Confirm Password">
 									<template slot="append">
 										<el-button type="primary" @click="password_confirmation_visible = !password_confirmation_visible"><i class="fas fa-eye"></i></el-button>
 									</template>
 								</el-input>
-								<el-input v-else v-model="form.password_confirmation" v-validate="'required|min:6|max:255'" type="password" name="password_confirmation" placeholder="Confirm Password">
+								<el-input v-else v-model="form.password_confirmation" type="password" name="password_confirmation" placeholder="Confirm Password">
 									<template slot="append">
 										<el-button type="primary" @click="password_confirmation_visible = !password_confirmation_visible"><i class="fas fa-eye-slash"></i></el-button>
 									</template>
 								</el-input>
-								<span class="text-danger" v-if="errors.has('password_confirmation')">{{ errors.first('password_confirmation') }}<br/></span>
+								 <has-error :form="form" field="password_confirmation"/>
 							</div>
 						</div>
 
 						<div class="form-group row">
 							<div class="col-md-7 offset-md-3 d-flex">
 								<!-- Submit Button -->
-								<v-button :loading="form.busy" :disabled="errors.any() || form.password=='' || form.password_confirmation=='' || form.email=='' || form.marking=='' ? true : false">
+								<v-button :loading="form.busy" :disabled="form.password=='' || form.password_confirmation=='' || form.email=='' || form.marking=='' ? true : false">
 									{{ $t('register') }}
 								</v-button>