diff --git a/resources/assets/js/pages/auth/register.vue b/resources/assets/js/pages/auth/register.vue
index 272c25f0..672f0539 100644
--- a/resources/assets/js/pages/auth/register.vue
+++ b/resources/assets/js/pages/auth/register.vue
@@ -62,7 +62,7 @@
 					<div class="form-group row">
 						<div class="col-md-7 offset-md-3 d-flex">
 							<!-- Submit Button -->
-							<v-button :loading="form.busy">
+							<v-button :loading="form.busy" :disabled="errors.any() || form.password=='' || form.password_confirmation=='' || form.email=='' || form.marking=='' ? true : false">
 								{{ $t('register') }}
 							</v-button>
 
@@ -112,10 +112,6 @@ export default {
 		async register () {
 			var token
 			var data 
-			this.$validator.validateAll();
-			if (this.errors.any()) {
-				return;
-			}
 			// Register the user.
 			await this.form.post('/api/register')
 			.then( (response) => {