diff --git a/public/modules/users/views/signup.client.view.html b/public/modules/users/views/signup.client.view.html
index 10f84d74ac..200d55d81b 100644
--- a/public/modules/users/views/signup.client.view.html
+++ b/public/modules/users/views/signup.client.view.html
@@ -16,7 +16,7 @@ <h3 class="col-md-12 text-center">Sign up using your social accounts</h3>
 	</div>
 	<h3 class="col-md-12 text-center">Or with your email</h3>
 	<div class="col-xs-offset-2 col-xs-8 col-md-offset-5 col-md-2">
-		<form data-ng-submit="signup()" class="signin form-horizontal" novalidate autocomplete="off">
+		<form  name="userForm" data-ng-submit="userForm.$valid && signup()" class="signin form-horizontal" novalidate autocomplete="off">
 			<fieldset>
 				<div class="form-group">
 					<label for="firstName">First Name</label>
@@ -28,7 +28,7 @@ <h3 class="col-md-12 text-center">Or with your email</h3>
 				</div>
 				<div class="form-group">
 					<label for="email">Email</label>
-					<input type="text" id="email" name="email" class="form-control" data-ng-model="credentials.email" placeholder="Email">
+					<input type="email" id="email" name="email" class="form-control" data-ng-model="credentials.email" placeholder="Email">
 				</div>
 				<div class="form-group">
 					<label for="username">Username</label>
@@ -48,4 +48,4 @@ <h3 class="col-md-12 text-center">Or with your email</h3>
 			</fieldset>
 		</form>
 	</div>
-</section>
\ No newline at end of file
+</section>