diff --git a/packages/components-faraday/src/components/Admin/utils.js b/packages/components-faraday/src/components/Admin/utils.js
index ee33093e2176bcb429d904f8d4d5637aaa4eaeed..5c761760feaff1b80d4096055dbc4121ef310b9a 100644
--- a/packages/components-faraday/src/components/Admin/utils.js
+++ b/packages/components-faraday/src/components/Admin/utils.js
@@ -20,6 +20,7 @@ export const setAdmin = values => {
 
   return {
     ...omit(newValues, ['role']),
+    username: newValues.email,
     isConfirmed: false,
     passwordResetToken: generatePasswordHash(),
     password: 'defaultpass',
diff --git a/packages/components-faraday/src/components/SignUp/SignUpInvitationPage.js b/packages/components-faraday/src/components/SignUp/SignUpInvitationPage.js
index 5699888919716ae1dca12dc72f1984ac073be373..c78509321c5dc27f5fbd051e4406537c65a84fe6 100644
--- a/packages/components-faraday/src/components/SignUp/SignUpInvitationPage.js
+++ b/packages/components-faraday/src/components/SignUp/SignUpInvitationPage.js
@@ -31,7 +31,7 @@ const login = (dispatch, values, history) =>
 const confirmUser = (email, token, history) => (values, dispatch) => {
   const request = { ...values, email, token }
   if (values) {
-    return create('/users/invite/password/reset', request)
+    return create('/users/reset-password', request)
       .then(r => {
         const { username } = r
         const { password } = values
@@ -52,6 +52,7 @@ const confirmUser = (email, token, history) => (values, dispatch) => {
 export default compose(
   withJournal,
   withState('step', 'changeStep', 0),
+  withState('initialValues', 'setInitialValues', {}),
   withProps(({ location }) => {
     const params = new URLSearchParams(location.search)
     const email = params.get('email')
@@ -66,11 +67,11 @@ export default compose(
   }),
   lifecycle({
     componentDidMount() {
-      const { email, token } = this.props
-      const encodedUri = `?email=${encodeURIComponent(email)}&token=${token}`
-      request(`/users/invite${encodedUri}`)
+      const { setInitialValues, token } = this.props
+      const encodedUri = `?passwordResetToken=${token}`
+      request(`/users/${encodedUri}`)
         .then(res => {
-          this.setState({ initialValues: res })
+          setInitialValues(v => res.users[0])
         })
         .catch(err => {
           this.setState({ error: err.response })