diff --git a/client/modules/User/pages/LoginView.js b/client/modules/User/pages/LoginView.js
index 4900ed2a..76c2e4cb 100644
--- a/client/modules/User/pages/LoginView.js
+++ b/client/modules/User/pages/LoginView.js
@@ -27,6 +27,12 @@ function mapDispatchToProps(dispatch) {
 
 function validate(formProps) {
   const errors = {};
+  if (!formProps.email) {
+    errors.email = 'Please enter a email';
+  }
+  if (!formProps.password) {
+    errors.password = 'Please enter a password';
+  }
   return errors;
 }
 
diff --git a/client/modules/User/pages/SignupView.js b/client/modules/User/pages/SignupView.js
index 48280be7..e24283c8 100644
--- a/client/modules/User/pages/SignupView.js
+++ b/client/modules/User/pages/SignupView.js
@@ -27,6 +27,23 @@ function mapDispatchToProps(dispatch) {
 
 function validate(formProps) {
   const errors = {};
+
+  if (!formProps.username) {
+    errors.username = 'Please enter a username';
+  }
+  if (!formProps.email) {
+    errors.email = 'Please enter an email';
+  }
+  if (!formProps.password) {
+    errors.password = 'Please enter a password';
+  }
+  if (!formProps.confirmPassword) {
+    errors.confirmPassword = 'Please enter a password confirmation';
+  }
+
+  if (formProps.password !== formProps.passwordConfirm) {
+    errors.password = 'Passwords must match';
+  }
   return errors;
 }