diff --git a/services/web/app/src/Features/PasswordReset/PasswordResetRouter.js b/services/web/app/src/Features/PasswordReset/PasswordResetRouter.js
index 2a53cb5bb8..5240458759 100644
--- a/services/web/app/src/Features/PasswordReset/PasswordResetRouter.js
+++ b/services/web/app/src/Features/PasswordReset/PasswordResetRouter.js
@@ -1,5 +1,6 @@
 const PasswordResetController = require('./PasswordResetController')
 const AuthenticationController = require('../Authentication/AuthenticationController')
+const { Joi, validate } = require('../../infrastructure/Validation')
 
 module.exports = {
   apply(webRouter, apiRouter) {
@@ -7,7 +8,15 @@ module.exports = {
       '/user/password/reset',
       PasswordResetController.renderRequestResetForm
     )
-    webRouter.post('/user/password/reset', PasswordResetController.requestReset)
+    webRouter.post(
+      '/user/password/reset',
+      validate({
+        body: Joi.object({
+          email: Joi.string().required()
+        })
+      }),
+      PasswordResetController.requestReset
+    )
     AuthenticationController.addEndpointToLoginWhitelist('/user/password/reset')
 
     webRouter.get(
@@ -16,10 +25,24 @@ module.exports = {
     )
     webRouter.post(
       '/user/password/set',
+      validate({
+        body: Joi.object({
+          password: Joi.string().required(),
+          passwordResetToken: Joi.string().required()
+        })
+      }),
       PasswordResetController.setNewUserPassword
     )
     AuthenticationController.addEndpointToLoginWhitelist('/user/password/set')
 
-    webRouter.post('/user/reconfirm', PasswordResetController.requestReset)
+    webRouter.post(
+      '/user/reconfirm',
+      validate({
+        body: Joi.object({
+          email: Joi.string().required()
+        })
+      }),
+      PasswordResetController.requestReset
+    )
   }
 }
diff --git a/services/web/test/acceptance/src/PasswordResetTests.js b/services/web/test/acceptance/src/PasswordResetTests.js
index b53e1313d0..ffea5cfc89 100644
--- a/services/web/test/acceptance/src/PasswordResetTests.js
+++ b/services/web/test/acceptance/src/PasswordResetTests.js
@@ -206,4 +206,55 @@ describe('PasswordReset', function() {
       expect(response.statusCode).to.equal(404)
     })
   })
+  describe('password reset', function() {
+    it('should return 200 if email field is valid', async function() {
+      response = await userHelper.request.post(`/user/password/reset`, {
+        form: {
+          email
+        }
+      })
+      expect(response.statusCode).to.equal(200)
+    })
+
+    it('should return 400 if email field is missing', async function() {
+      response = await userHelper.request.post(`/user/password/reset`, {
+        form: {
+          mail: email
+        },
+        simple: false
+      })
+      expect(response.statusCode).to.equal(400)
+    })
+  })
+  describe('password set', function() {
+    it('should return 200 if password and passwordResetToken fields are valid', async function() {
+      response = await userHelper.request.post(`/user/password/set`, {
+        form: {
+          password: 'new-password',
+          passwordResetToken: token
+        }
+      })
+      expect(response.statusCode).to.equal(200)
+    })
+
+    it('should return 400 if password field is missing', async function() {
+      response = await userHelper.request.post(`/user/password/set`, {
+        form: {
+          passwordResetToken: token
+        },
+        simple: false
+      })
+      expect(response.statusCode).to.equal(400)
+    })
+
+    it('should return 400 if passwordResetToken field is missing', async function() {
+      response = await userHelper.request.post(`/user/password/set`, {
+        form: {
+          password: 'new-password'
+        },
+        simple: false
+      })
+      expect(response.statusCode).to.equal(400)
+    })
+  })
 })