diff --git a/src/dev/peerat/backend/routes/users/ForgotPassword.java b/src/dev/peerat/backend/routes/users/ForgotPassword.java
index 0f8f661..f097cd6 100644
--- a/src/dev/peerat/backend/routes/users/ForgotPassword.java
+++ b/src/dev/peerat/backend/routes/users/ForgotPassword.java
@@ -51,7 +51,7 @@ public class ForgotPassword extends FormResponse{
 			return;
 		}
 		
-		if(areValids("code","password")){
+		if(hasFields("code") && areValids("password")){
 			Integer checkCode = codes.get(email);
 			if(checkCode == null){
 				context.response(400);