diff --git a/demos/vanilla-browser/.gitignore b/demos/vanilla-browser/.gitignore
deleted file mode 100644
index 1bf4259af7..0000000000
--- a/demos/vanilla-browser/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-config.js
diff --git a/demos/vanilla-browser/README.md b/demos/vanilla-browser/README.md
index 9bc5299ee7..0d3fb598dc 100644
--- a/demos/vanilla-browser/README.md
+++ b/demos/vanilla-browser/README.md
@@ -1,9 +1,12 @@
-# Running this demo
+# ArcGIS Rest JS / Vanilla JS Demo
 
-1. Make sure you run `npm run bootstrap` in the root folder to setup the dependencies
-2. Register a new app on https://developers.arcgis.com
-3. Add a redirect URL of `http://localhost:8080/post-sign-in.html` to your app.
-4. Copy the `config.js.template` file, rename it to `config.js`
-5. Copy your apps client id into your new `config.js` file.
-6. `npm start`
-7. Visit http://localhost:8080 and click "Sign In" to start the OAuth 2.0 process.
+This demo uses Vanilla JS to implement OAuth2 using
+the `arcgis-rest-js` libraries.
+
+## Running this demo
+1. Like all the other demo apps, run `npm run bootstrap` in the root directory.
+1. Register an app at [https://developers.arcgis.com](https://developers.arcgis.com).
+1. Add a redirect URL of `http://localhost:8080` to your new app.
+1. Copy the `Client ID` of your new app.
+1. Run `npm start` to spin up the development server.
+1. Visit [http://localhost:8080](http://localhost:8080) and paste the copied `Client ID`.
diff --git a/demos/vanilla-browser/authenticate.html b/demos/vanilla-browser/authenticate.html
new file mode 100644
index 0000000000..823b02e16d
--- /dev/null
+++ b/demos/vanilla-browser/authenticate.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>ArcGIS Rest JS Vanilla JS</title>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+    <link rel="stylesheet" href="./style.css">
+  </head>
+  <body>
+    <script src="node_modules/@esri/arcgis-rest-request/dist/umd/arcgis-rest-request.umd.js"></script>
+    <script src="node_modules/@esri/arcgis-rest-auth/dist/umd/arcgis-rest-auth.umd.js"></script>
+    <script>
+      const match = window.location.href.match(
+        /clientID=(.+)#/
+      );
+      const clientId = match[1];
+      let session;
+      function processAuthentication() {
+        session = arcgisRest.UserSession.completeOAuth2({
+          clientId,
+        });
+        localStorage.setItem('__ARCGIS_REST_USER_SESSION__', JSON.stringify(session));
+        window.location.href = '/';
+      }
+      processAuthentication();
+    </script>
+  </body>
+</html>
diff --git a/demos/vanilla-browser/config.js.template b/demos/vanilla-browser/config.js.template
deleted file mode 100644
index 130c3d82f6..0000000000
--- a/demos/vanilla-browser/config.js.template
+++ /dev/null
@@ -1 +0,0 @@
-var ClientId = "CLIENT_ID";
diff --git a/demos/vanilla-browser/index.html b/demos/vanilla-browser/index.html
index 57dc4378c4..f4ce5b9b10 100644
--- a/demos/vanilla-browser/index.html
+++ b/demos/vanilla-browser/index.html
@@ -1,33 +1,171 @@
 <!DOCTYPE html>
-<html>
-<head>
-<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
-</head>
-<body>
-
-<a href="" class="btn" id="sign-in" role="button">Sign In</a>
-
-<script src="config.js"></script>
-<script src="node_modules/@esri/arcgis-rest-request/dist/umd/arcgis-rest-request.umd.js"></script>
-<script src="node_modules/@esri/arcgis-rest-auth/dist/umd/arcgis-rest-auth.umd.js"></script>
-
-<script>
-var btn = document.getElementById('sign-in');
-
-btn.addEventListener('click', function (e) {
-  arcgisRest.UserSession.beginOAuth2({
-    clientId: ClientId,
-    redirectUri: "http://localhost:8080/post-sign-in.html",
-    popup: true,
-    portal: "https://www.arcgis.com/sharing/rest"
-  }).then((session) => {
-    console.log(session);
-  }).catch(error => {
-    console.log(error);
-  });
-
-  e.preventDefault();
-});
-</script>
-</body>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>ArcGIS Rest JS Vanilla JS</title>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+    <link rel="stylesheet" href="./style.css">
+  </head>
+  <body>
+    <div id="app-wrapper">
+      <div class="jumbotron">
+        <div class="container">
+          <div id="page-header" class="row">
+            <div id="logo-container" class="col-sm-3">
+              <img id="logo" src="./logo.svg">
+            </div>
+            <div class="col-sm-9">
+              <h2>
+                ArcGIS Rest JS Vanilla JS Demo
+              </h2>
+              <p>
+                A vanilla JS application utilizing the arcgis-rest-js library.
+              </p>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="container">
+        <div class="row">
+          <div class="col-xs-12">
+            <div id="clientIdGroup" class="form-group">
+              <label class="control-label">Client ID</label>
+              <!-- This is input required for the app. -->
+              <input
+                id="clientId"
+                type="text"
+                class="form-control"
+                placeholder="Client ID"
+              >
+            </div>
+            <p class="help-block">
+              You can generate your own client id by creating an application on the
+              <a target='_blank' href='https://developers.arcgis.com/'>
+                ArcGIS for Developers
+              </a>
+              site. Be sure to add
+              <code id="redirect_uri">
+                <!-- Redirect URI will be injected here. -->
+              </code>
+              as a redirect uri for your application.
+            </p>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-xs-6">
+            <!-- Event listeners will be added to these buttons. -->
+            <button class="btn btn-primary btn-block" id='withPopupButton'>Sign In (with popup)</button>
+          </div>
+          <div class="col-xs-6">
+            <button class="btn btn-primary btn-block" id='withoutPopupButton'>Sign In (without popup)</button>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-xs-12 text-center">
+            <p id="sessionInfo" class="info-panel">
+              <!-- Information will be injected here. -->
+            </p>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <script src="node_modules/@esri/arcgis-rest-request/dist/umd/arcgis-rest-request.umd.js"></script>
+    <script src="node_modules/@esri/arcgis-rest-auth/dist/umd/arcgis-rest-auth.umd.js"></script>
+    <script>
+      // Define a global session variable.
+      let session = null;
+      // Check to see if there is a serialized session in local storage.
+      const serializedSession = localStorage.getItem('__ARCGIS_REST_USER_SESSION__');
+      if (serializedSession !== null && serializedSession !== "undefined") {
+        // If there is a serialized session, parse it and create a new session object.
+        session = new arcgisRest.UserSession(JSON.parse(serializedSession));
+        console.log(session);
+        // Update the UI.
+        document.getElementById('clientId').value = session.clientId;
+      }
+      // Clear the previous session.
+      localStorage.removeItem('__ARCGIS_REST_USER_SESSION__');
+
+      // Define the variable used for the redirect uri.
+      const redirect_uri = `${window.location.origin}${window.location.pathname}`;
+      // Inject that value into the page text.
+      document.getElementById('redirect_uri').innerHTML = redirect_uri;
+
+      // Funtion to check that a client id is present.
+      function requireClientId() {
+        // Pull out the client id.
+        let clientId = document.getElementById('clientId').value;
+        // Reset the error tracker to null.
+        let clientIdError = null;
+        // If there is no client id, flag input with error and return false.
+        if (!clientId) {
+          clientIdError = true;
+          document.getElementById('clientIdGroup').classList.add('has-error');
+          return false;
+        }
+        // Otherwise return true and clear any errors.
+        document.getElementById('clientIdGroup').classList.remove('has-error');
+        return true;
+      }
+
+      // Attach a listener to validate the client id on change.
+      document.getElementById('clientId').addEventListener('input', (event) => {
+        requireClientId();
+      });
+
+      // Function to update the UI with session info.
+      function updateSessionInfo(session) {
+        let sessionInfo = document.getElementById('sessionInfo')
+        if(session) {
+          sessionInfo.classList.remove('bg-info');
+          sessionInfo.classList.add('bg-success');
+          sessionInfo.innerHTML = `Logged in as ${session.username}.`;
+        } else {
+          sessionInfo.classList.remove('bg-success');
+          sessionInfo.classList.add('bg-info');
+          sessionInfo.innerHTML = 'Log in using one of the methods above to start a session.';
+        }
+      }
+
+      // Call the function on page load to set current state.
+      updateSessionInfo(session);
+
+      // Attach a listener to the sign in buttons.
+      document.getElementById('withPopupButton').addEventListener('click', (event) => {
+        event.preventDefault();
+        if (requireClientId()) {
+          // Grab the client id value.
+          let clientId = document.getElementById('clientId').value;
+          // Begin an OAuth2 login using a popup.
+          arcgisRest.UserSession.beginOAuth2({
+            clientId,
+            redirectUri: `${redirect_uri}authenticate.html?clientID=${clientId}`,
+            popup: true,
+          }).then((newSession) => {
+            // Upon a successful login, update the session with the new session.
+            session = newSession;
+            console.log(session);
+            updateSessionInfo(session);
+          }).catch(error => {
+            console.log(error);
+          });
+        }
+      });
+
+      // Attach a listener to the sign in buttons.
+      document.getElementById('withoutPopupButton').addEventListener('click', (event) => {
+        event.preventDefault();
+        if (requireClientId()) {
+          let clientId = document.getElementById('clientId').value;
+          // Begin an OAuth2 login without a popup.
+          arcgisRest.UserSession.beginOAuth2({
+            clientId,
+            redirectUri: `${redirect_uri}authenticate.html?clientID=${clientId}`,
+            popup: false,
+          });
+        }
+      });
+    </script>
+  </body>
 </html>
diff --git a/demos/vanilla-browser/logo.svg b/demos/vanilla-browser/logo.svg
new file mode 100644
index 0000000000..9650ca78ef
--- /dev/null
+++ b/demos/vanilla-browser/logo.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 630 630">
+<rect width="630" height="630" fill="#f7df1e"/>
+<path d="m423.2 492.19c12.69 20.72 29.2 35.95 58.4 35.95 24.53 0 40.2-12.26 40.2-29.2 0-20.3-16.1-27.49-43.1-39.3l-14.8-6.35c-42.72-18.2-71.1-41-71.1-89.2 0-44.4 33.83-78.2 86.7-78.2 37.64 0 64.7 13.1 84.2 47.4l-46.1 29.6c-10.15-18.2-21.1-25.37-38.1-25.37-17.34 0-28.33 11-28.33 25.37 0 17.76 11 24.95 36.4 35.95l14.8 6.34c50.3 21.57 78.7 43.56 78.7 93 0 53.3-41.87 82.5-98.1 82.5-54.98 0-90.5-26.2-107.88-60.54zm-209.13 5.13c9.3 16.5 17.76 30.45 38.1 30.45 19.45 0 31.72-7.61 31.72-37.2v-201.3h59.2v202.1c0 61.3-35.94 89.2-88.4 89.2-47.4 0-74.85-24.53-88.81-54.075z"/>
+</svg>
\ No newline at end of file
diff --git a/demos/vanilla-browser/post-sign-in.html b/demos/vanilla-browser/post-sign-in.html
deleted file mode 100644
index 2d47cbf05b..0000000000
--- a/demos/vanilla-browser/post-sign-in.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
-</head>
-<body>
-
-<script src="config.js"></script>
-<script src="node_modules/@esri/arcgis-rest-request/dist/umd/arcgis-rest-request.umd.js"></script>
-<script src="node_modules/@esri/arcgis-rest-auth/dist/umd/arcgis-rest-auth.umd.js"></script>
-
-<script>
-try {
-  arcgisRest.UserSession.completeOAuth2({
-    clientId: ClientId,
-    redirectUri: "http://localhost:8080/post-sign-in.html",
-    popup: true,
-    portal: "https://www.arcgis.com/sharing/rest"
-  });
-} catch (e) {
-  console.log('error', e);
-}
-</script>
-</body>
-</html>
diff --git a/demos/vanilla-browser/style.css b/demos/vanilla-browser/style.css
new file mode 100644
index 0000000000..84a19ae086
--- /dev/null
+++ b/demos/vanilla-browser/style.css
@@ -0,0 +1,36 @@
+html, body {
+  width: 100%;
+  height: 100%;
+}
+
+.row {
+  margin-bottom: 25px;
+}
+
+.jumbotron {
+  padding-top: 0px;
+  padding-bottom: 0px;
+}
+
+#logo-container {
+  display: flex;
+  justify-content: center;
+  align-content: center;
+}
+#logo {
+  width: 125px;
+  height: 125px;
+  padding: 12.5px;
+}
+
+.info-panel{
+  padding: 15px;
+}
+
+.loading-table {
+  width: 100%;
+  height: 150px;
+  display: flex;
+  align-content: center;
+  justify-content: center;
+}
