diff --git a/.gitignore b/.gitignore
index b3db3e2..d4bf309 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,4 +36,5 @@ out/
 ### VS Code ###
 .vscode/
 
+### Project specific
 application.yml
diff --git a/README.md b/README.md
index dd76df0..fa76151 100644
--- a/README.md
+++ b/README.md
@@ -24,4 +24,6 @@ Once you are fully up to speed and working on the project it is perfectly accept
 
 Once you have your teams set up, enjoy working on the code.
 
-We look forward to seeing what you manage to produce from it!
\ No newline at end of file
+We look forward to seeing what you manage to produce from it!
+
+----Test access Magnus-----
diff --git a/src/main/java/com/booleanuk/cohorts/controllers/AuthController.java b/src/main/java/com/booleanuk/cohorts/controllers/AuthController.java
index 0c9ba64..ed83d30 100644
--- a/src/main/java/com/booleanuk/cohorts/controllers/AuthController.java
+++ b/src/main/java/com/booleanuk/cohorts/controllers/AuthController.java
@@ -69,6 +69,16 @@ public ResponseEntity<?> registerUser(@Valid @RequestBody SignupRequest signupRe
         if (userRepository.existsByEmail(signupRequest.getEmail())) {
             return ResponseEntity.badRequest().body(new MessageResponse("Error: Email is already in use!"));
         }
+        String emailRegex = "^\\w+([.-]?\\w+)*@\\w+([.-]?\\w+)*(\\.\\w{2,3})+$";
+        String passwordRegex = "^(?=.*[A-Z])(?=.*[0-9])(?=.*[#?!@$%^&-]).{8,}$";
+
+        if(!signupRequest.getEmail().matches(emailRegex))
+            return ResponseEntity.badRequest().body(new MessageResponse("Email is incorrect"));
+
+        if(!signupRequest.getPassword().matches(passwordRegex))
+            return ResponseEntity.badRequest().body(new MessageResponse("Password is incorrect"));
+
+
         // Create a new user add salt here if using one
         User user = new User(signupRequest.getEmail(), encoder.encode(signupRequest.getPassword()));
         if (signupRequest.getCohort() != null) {