diff --git a/packages/oauth/README.md b/packages/oauth/README.md
index 81d54b502..631e56fa6 100644
--- a/packages/oauth/README.md
+++ b/packages/oauth/README.md
@@ -140,11 +140,15 @@ If you decide you need custom success or failure behaviors (ex: wanting to show
 const callbackOptions = {
   success: (installation, metadata, req, res) => {
     // Do custom success logic here
-    res.send('successful!');
+    // tip: you can add javascript and css in the htmlResponse using the <script> and <style> tags
+    const htmlResponse = `<html><body>Success!</body></html>`
+    res.writeHead(200, { 'Content-Type': 'text/html' });
+    res.end(htmlResponse);
   }, 
   failure: (error, installOptions , req, res) => {
     // Do custom failure logic here
-    res.send('failure');
+    res.writeHead(500, { 'Content-Type': 'text/html' });
+    res.end('<html><body><h1>Oops, Something Went Wrong! Please Try Again or Contact the App Owner</h1></body></html>');
   }
 }
 app.get('/slack/oauth_redirect', (req, res) => {
diff --git a/packages/oauth/src/index.ts b/packages/oauth/src/index.ts
index 7b13b0815..9f31ab760 100644
--- a/packages/oauth/src/index.ts
+++ b/packages/oauth/src/index.ts
@@ -179,7 +179,7 @@ export class InstallProvider {
         parsedUrl = parseUrl(req.url, true);
         code = parsedUrl.query.code as string;
         state = parsedUrl.query.state as string;
-        if (state === undefined || code === undefined) {
+        if (state === undefined || state === '' || code === undefined) {
           throw new MissingStateError('redirect url is missing state or code query parameters');
         }
       } else {
@@ -507,8 +507,14 @@ function callbackSuccess(
     // redirect back to slack
     // Open in native app
     const redirectUrl = `slack://app?team=${installation.team.id}&id=${installation.appId}`;
-    res.writeHead(302, { Location: redirectUrl });
-    res.end();
+    const htmlResponse = `<html>
+    <meta http-equiv="refresh" content="0; URL=${redirectUrl}">
+    <body>
+      <h1>Success! Redirecting to the Slack App...</h1>
+      <button onClick="window.location = '${redirectUrl}'">Click here to redirect</button>
+    </body></html>`;
+    res.writeHead(200, { 'Content-Type': 'text/html' });
+    res.end(htmlResponse);
   } else {
     // Send a generic success page
     // TODO: make this page pretty?
