diff --git a/ghost/portal/src/components/ParentContainer.js b/ghost/portal/src/components/ParentContainer.js
index 84de0ca350..96484672f7 100644
--- a/ghost/portal/src/components/ParentContainer.js
+++ b/ghost/portal/src/components/ParentContainer.js
@@ -16,7 +16,8 @@ export default class ParentContainer extends React.Component {
             page: 'loading',
             showPopup: false,
             action: 'init:running',
-            initStatus: 'running'
+            initStatus: 'running',
+            lastPage: null
         };
     }
 
@@ -102,7 +103,8 @@ export default class ParentContainer extends React.Component {
         try {
             if (action === 'switchPage') {
                 this.setState({
-                    page: data
+                    page: data.page,
+                    lastPage: data.lastPage || null
                 });
             } else if (action === 'togglePopup') {
                 this.setState({
diff --git a/ghost/portal/src/components/pages/MagicLinkPage.js b/ghost/portal/src/components/pages/MagicLinkPage.js
index 6fa0fd88a1..46e18f0f2a 100644
--- a/ghost/portal/src/components/pages/MagicLinkPage.js
+++ b/ghost/portal/src/components/pages/MagicLinkPage.js
@@ -17,7 +17,12 @@ export default class MagicLinkPage extends React.Component {
     renderLoginMessage() {
         return (
             <div style={{display: 'flex', justifyContent: 'center'}}>
-                <div style={{color: '#3db0ef', fontWeight: 'bold', cursor: 'pointer'}} onClick={() => this.context.onAction('switchPage', 'signin')}> Back to Log in </div>
+                <div
+                    style={{color: '#3db0ef', fontWeight: 'bold', cursor: 'pointer'}}
+                    onClick={() => this.context.onAction('switchPage', {page: 'signin'})}
+                >
+                    Back to Log in
+                </div>
             </div>
         );
     }
diff --git a/ghost/portal/src/components/pages/SigninPage.js b/ghost/portal/src/components/pages/SigninPage.js
index 5947715f38..fac06c3ab6 100644
--- a/ghost/portal/src/components/pages/SigninPage.js
+++ b/ghost/portal/src/components/pages/SigninPage.js
@@ -71,7 +71,13 @@ export default class SigninPage extends React.Component {
         return (
             <div style={{display: 'flex', justifyContent: 'center'}}>
                 <div style={{marginRight: '6px', color: '#929292'}}> Don't have an account ? </div>
-                <div style={{color: brandColor, fontWeight: 'bold', cursor: 'pointer'}} role="button" onClick={() => this.context.onAction('switchPage', 'signup')}> Subscribe </div>
+                <div
+                    style={{color: brandColor, fontWeight: 'bold', cursor: 'pointer'}}
+                    role="button"
+                    onClick={() => this.context.onAction('switchPage', {page: 'signup'})}
+                >
+                    Subscribe
+                </div>
             </div>
         );
     }
diff --git a/ghost/portal/src/components/pages/SigninPage.test.js b/ghost/portal/src/components/pages/SigninPage.test.js
index 183d16aa1c..19db86ee1a 100644
--- a/ghost/portal/src/components/pages/SigninPage.test.js
+++ b/ghost/portal/src/components/pages/SigninPage.test.js
@@ -41,6 +41,6 @@ describe('SigninPage', () => {
         const {signupButton, mockOnActionFn} = setup();
 
         fireEvent.click(signupButton);
-        expect(mockOnActionFn).toHaveBeenCalledWith('switchPage', 'signup');
+        expect(mockOnActionFn).toHaveBeenCalledWith('switchPage', {page: 'signup'});
     });
 });
diff --git a/ghost/portal/src/components/pages/SignupPage.js b/ghost/portal/src/components/pages/SignupPage.js
index 4ca0adcd81..c2c9a2581b 100644
--- a/ghost/portal/src/components/pages/SignupPage.js
+++ b/ghost/portal/src/components/pages/SignupPage.js
@@ -106,7 +106,7 @@ class SignupPage extends React.Component {
         return (
             <div style={{display: 'flex', justifyContent: 'center'}}>
                 <div style={{marginRight: '6px', color: '#929292'}}> Already a member ? </div>
-                <div style={{color: brandColor, fontWeight: 'bold', cursor: 'pointer'}} role="button" onClick={() => onAction('switchPage', 'signin')}> Log in </div>
+                <div style={{color: brandColor, fontWeight: 'bold', cursor: 'pointer'}} role="button" onClick={() => onAction('switchPage', {page: 'signin'})}> Log in </div>
             </div>
         );
     }
diff --git a/ghost/portal/src/components/pages/SignupPage.test.js b/ghost/portal/src/components/pages/SignupPage.test.js
index c1fa0314f7..a43d0375cd 100644
--- a/ghost/portal/src/components/pages/SignupPage.test.js
+++ b/ghost/portal/src/components/pages/SignupPage.test.js
@@ -49,6 +49,6 @@ describe('SignupPage', () => {
         const {signinButton, mockOnActionFn} = setup();
 
         fireEvent.click(signinButton);
-        expect(mockOnActionFn).toHaveBeenCalledWith('switchPage', 'signin');
+        expect(mockOnActionFn).toHaveBeenCalledWith('switchPage', {page: 'signin'});
     });
 });