diff --git a/src/components/App.js b/src/components/App.js
index 0c514e36..dd43cadf 100644
--- a/src/components/App.js
+++ b/src/components/App.js
@@ -9,7 +9,7 @@ import RegisterPage from '../containers/register/RegisterPage';
 import theme from '../containers/styles/theme';
 const isGhPages = process.env.REACT_APP_GH_PAGES === 'true';
 const Router = isGhPages ? HashRouter : BrowserRouter;
-const redirect = isGhPages ? '/#/index' : '/index';
+const redirect = isGhPages ? '/request-generator/#/index' : '/index';
 const App = () => {
   return (
     <Router>
diff --git a/src/components/RequestBox/InProgressFormBox/InProgressFormBox.js b/src/components/RequestBox/InProgressFormBox/InProgressFormBox.js
index 293003e8..a9d90891 100644
--- a/src/components/RequestBox/InProgressFormBox/InProgressFormBox.js
+++ b/src/components/RequestBox/InProgressFormBox/InProgressFormBox.js
@@ -4,7 +4,7 @@ import './InProgressFormBoxStyle.css';
 
 export default function InProgressFormBox(props) {
     return (
-        props.qrResponse.questionnaire ? (
+        props.qrResponse?.questionnaire ? (
                 <Box className={'inprogress-container'}>
                     <Typography variant='h6' color='text.primary' gutterBottom>
                         In Progress Form
diff --git a/src/components/RequestBox/RequestBox.js b/src/components/RequestBox/RequestBox.js
index b71ab0bd..408367a2 100644
--- a/src/components/RequestBox/RequestBox.js
+++ b/src/components/RequestBox/RequestBox.js
@@ -385,10 +385,12 @@ export default class RequestBox extends Component {
                 </div>
               </div>
               <div className="action-btns">
-                <InProgressFormBox
-                  qrResponse={this.props.response}
-                  relaunch={this.relaunch}
-                />
+                {Object.keys(this.props.response).length ?
+                  <InProgressFormBox
+                    qrResponse={this.props.response}
+                    relaunch={this.relaunch}
+                  />
+                : <span />}
                 <ButtonGroup variant="outlined" aria-label="outlined button group">
                   <Button onClick={this.launchSmartOnFhirApp} disabled={disableLaunchSmartOnFhir}>
                     Launch SMART on FHIR App
diff --git a/src/containers/Launch.jsx b/src/containers/Launch.jsx
index 4021ef82..0d2ca90b 100644
--- a/src/containers/Launch.jsx
+++ b/src/containers/Launch.jsx
@@ -1,4 +1,5 @@
 import env from 'env-var';
+import queryString from 'querystring';
 import FHIR from 'fhirclient';
 import React, { memo, useEffect, useState } from 'react';
 import RegisterPage from './register/RegisterPage';
@@ -25,8 +26,11 @@ const Launch = props => {
       }
     }
     const urlSearchString = window.location.search;
-    const params = new URLSearchParams(urlSearchString);
-    const iss = params.get('iss');
+    const params = queryString.parse((window.location.hash || '').replace(/\/?#\/?launch\?/, ''));
+    const iss = params.iss;
+    console.log('iss: ' + iss);
+    const launch = params.launch;
+    console.log('launch: ' + launch);
     if (iss) {
       const storedClient = clients.find(e => {
         return e.name == iss;
@@ -39,7 +43,9 @@ const Launch = props => {
           .authorize({
             clientId: clientId,
             scope: env.get('REACT_APP_CLIENT_SCOPES').asString(),
-            redirectUri: '/index'
+            redirectUri: props.redirect,
+            iss: iss,
+            launch: launch
           })
           .catch(e => {
             console.log(e);
diff --git a/src/containers/RequestBuilder.js b/src/containers/RequestBuilder.js
index f6eed7b8..eba3a64c 100644
--- a/src/containers/RequestBuilder.js
+++ b/src/containers/RequestBuilder.js
@@ -183,7 +183,7 @@ export default class RequestBuilder extends Component {
         })
         .catch(() => {
           this.consoleLog('No response received from the server', types.error);
-          this.setState({ response: null });
+          this.setState({ response: {} });
           this.setState({ loading: false });
         });
     } catch (error) {