diff --git a/src/routes/oauth2.js b/src/routes/oauth2.js
index 611126c72..92f045081 100644
--- a/src/routes/oauth2.js
+++ b/src/routes/oauth2.js
@@ -273,7 +273,7 @@ function renderAccountSetupSite(res, req, userObject, error) {
         user: userObject,
         error: error,
         csrf: req.csrfToken(),
-        resetToken: req.query.reset_token,
+        resetToken: req.query.reset_token || req.body.resetToken,
         title: 'Cloudron Password Setup'
     });
 }