diff --git a/frontend/src/App/App.jsx b/frontend/src/App/App.jsx
index 415df93781..578fbbe27b 100644
--- a/frontend/src/App/App.jsx
+++ b/frontend/src/App/App.jsx
@@ -1,12 +1,12 @@
 import React from 'react';
-import { Router, Route } from 'react-router-dom';
+import { Router, Route, Redirect } from 'react-router-dom';
 import { history } from '@/_helpers';
 import { authenticationService, tooljetService } from '@/_services';
 import { PrivateRoute } from '@/_components';
 import { HomePage } from '@/HomePage';
 import { LoginPage } from '@/LoginPage';
 import { SignupPage } from '@/SignupPage';
-import { InvitationPage } from '@/InvitationPage';
+import { ConfirmationPage } from '@/ConfirmationPage';
 import { Authorize } from '@/Oauth2';
 import { Authorize as Oauth } from '@/Oauth';
 import { Editor, Viewer } from '@/Editor';
@@ -118,7 +118,18 @@ class App extends React.Component {
             <Route path="/signup" component={SignupPage} />
             <Route path="/forgot-password" component={ForgotPassword} />
             <Route path="/reset-password" component={ResetPassword} />
-            <Route path="/invitations/:token" component={InvitationPage} />
+            <Route
+              path="/invitations/:token"
+              render={(props) => (
+                <Redirect
+                  to={{
+                    pathname: '/confirm',
+                    state: { token: props.match.params.token, search: props.location.search },
+                  }}
+                />
+              )}
+            />
+            <Route path="/confirm" component={ConfirmationPage} />
             <PrivateRoute
               exact
               path="/apps/:id"
diff --git a/frontend/src/InvitationPage/InvitationPage.jsx b/frontend/src/ConfirmationPage/ConfirmationPage.jsx
similarity index 97%
rename from frontend/src/InvitationPage/InvitationPage.jsx
rename to frontend/src/ConfirmationPage/ConfirmationPage.jsx
index 5bf0380c4f..92bb2cbb84 100644
--- a/frontend/src/InvitationPage/InvitationPage.jsx
+++ b/frontend/src/ConfirmationPage/ConfirmationPage.jsx
@@ -3,13 +3,13 @@ import { userService } from '@/_services';
 import { toast } from 'react-hot-toast';
 import queryString from 'query-string';
 
-class InvitationPage extends React.Component {
+class ConfirmationPage extends React.Component {
   constructor(props) {
     super(props);
 
     this.state = {
       isLoading: false,
-      newSignup: queryString.parse(props.location.search).signup,
+      newSignup: queryString.parse(props.location.state.search).signup,
     };
     this.formRef = React.createRef(null);
   }
@@ -26,7 +26,7 @@ class InvitationPage extends React.Component {
   setPassword = (e) => {
     e.preventDefault();
 
-    const token = this.props.match.params.token;
+    const token = this.props.location.state.token;
     const { password, organization, role, newSignup, firstName, lastName, password_confirmation } = this.state;
     this.setState({ isLoading: true });
 
@@ -203,4 +203,4 @@ class InvitationPage extends React.Component {
   }
 }
 
-export { InvitationPage };
+export { ConfirmationPage };
diff --git a/frontend/src/ConfirmationPage/index.js b/frontend/src/ConfirmationPage/index.js
new file mode 100644
index 0000000000..095a93bcd2
--- /dev/null
+++ b/frontend/src/ConfirmationPage/index.js
@@ -0,0 +1 @@
+export * from './ConfirmationPage';
diff --git a/frontend/src/InvitationPage/index.js b/frontend/src/InvitationPage/index.js
deleted file mode 100644
index cdca7c9f1d..0000000000
--- a/frontend/src/InvitationPage/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './InvitationPage';