diff --git a/webclient/src/forms/RegisterForm/RegisterForm.tsx b/webclient/src/forms/RegisterForm/RegisterForm.tsx
index ac2f7f4a..904e6ec4 100644
--- a/webclient/src/forms/RegisterForm/RegisterForm.tsx
+++ b/webclient/src/forms/RegisterForm/RegisterForm.tsx
@@ -63,6 +63,8 @@ const RegisterForm = ({ onSubmit }: RegisterFormProps) => {
 
     if (!values.password) {
       errors.password = 'Required';
+    } else if (values.password.length < 8) {
+      errors.password = 'Minimum of 8 characters required';
     } else if (passwordError) {
       errors.password = passwordError;
     }
diff --git a/webclient/src/forms/ResetPasswordForm/ResetPasswordForm.tsx b/webclient/src/forms/ResetPasswordForm/ResetPasswordForm.tsx
index 6d3f52da..0731974f 100644
--- a/webclient/src/forms/ResetPasswordForm/ResetPasswordForm.tsx
+++ b/webclient/src/forms/ResetPasswordForm/ResetPasswordForm.tsx
@@ -30,9 +30,13 @@ const ResetPasswordForm = ({ onSubmit, userName }) => {
     if (!values.token) {
       errors.token = 'Required';
     }
+
     if (!values.newPassword) {
       errors.newPassword = 'Required';
+    } else if (values.newPassword.length < 8) {
+      errors.password = 'Minimum of 8 characters required';
     }
+
     if (!values.passwordAgain) {
       errors.passwordAgain = 'Required';
     } else if (values.newPassword !== values.passwordAgain) {