diff --git a/ui/packages/consul-ui/app/components/action/index.hbs b/ui/packages/consul-ui/app/components/action/index.hbs
index 34667ae4c..5f165db43 100644
--- a/ui/packages/consul-ui/app/components/action/index.hbs
+++ b/ui/packages/consul-ui/app/components/action/index.hbs
@@ -19,7 +19,7 @@
   {{~/if~}}
 {{~else~}}
   <button
-    type="button"
+    type={{or @type 'button'}}
     {{on 'click' (optional @onclick)}}
     tabindex={{@tabindex}}
     ...attributes
diff --git a/ui/packages/consul-ui/app/components/outlet/index.js b/ui/packages/consul-ui/app/components/outlet/index.js
index 5e66fd6ae..d248ab475 100644
--- a/ui/packages/consul-ui/app/components/outlet/index.js
+++ b/ui/packages/consul-ui/app/components/outlet/index.js
@@ -27,7 +27,7 @@ export default class Outlet extends Component {
   }
 
   setAppRoute(name) {
-    if (name !== 'loading') {
+    if (name !== 'loading' || name === 'oidc-provider-debug') {
       const doc = this.element.ownerDocument.documentElement;
       if (doc.classList.contains('ember-loading')) {
         doc.classList.remove('ember-loading');
diff --git a/ui/packages/consul-ui/app/routing/route.js b/ui/packages/consul-ui/app/routing/route.js
index d621073b6..6e4ae8784 100644
--- a/ui/packages/consul-ui/app/routing/route.js
+++ b/ui/packages/consul-ui/app/routing/route.js
@@ -26,7 +26,7 @@ export default class BaseRoute extends Route {
       this.templateName = template;
     }
     const queryParams = get(routes, `${routeName}._options.queryParams`);
-    if(queryParams && this.routeName === 'dc.partitions.index') {
+    if(queryParams && (this.routeName === 'dc.partitions.index' || this.routeName === 'oauth-provider-debug')) {
       this.queryParams = queryParams;
     }
   }
diff --git a/ui/packages/consul-ui/app/services/auth-providers/oauth2-code-with-url-provider.js b/ui/packages/consul-ui/app/services/auth-providers/oauth2-code-with-url-provider.js
index 7924f3be0..f7a4cf7ca 100644
--- a/ui/packages/consul-ui/app/services/auth-providers/oauth2-code-with-url-provider.js
+++ b/ui/packages/consul-ui/app/services/auth-providers/oauth2-code-with-url-provider.js
@@ -1,4 +1,6 @@
 import OAuth2CodeProvider from 'torii/providers/oauth2-code';
+import { runInDebug } from '@ember/debug';
+
 export default class OAuth2CodeWithURLProvider extends OAuth2CodeProvider {
 
   name = 'oidc-with-url';
@@ -16,11 +18,13 @@ export default class OAuth2CodeWithURLProvider extends OAuth2CodeProvider {
       .open(url, responseParams, options)
       .then(function(authData) {
         // the same as the parent class but with an authorizationState added
-        return {
+        const creds = {
           authorizationState: authData.state,
           authorizationCode: decodeURIComponent(authData[responseType]),
           provider: name,
         };
+        runInDebug(_ => console.log('Retrieved the following creds from the OAuth Provider', creds))
+        return creds;
       });
   }
 
diff --git a/ui/packages/consul-ui/app/templates/application.hbs b/ui/packages/consul-ui/app/templates/application.hbs
index 68bfdba6e..b7efdce17 100644
--- a/ui/packages/consul-ui/app/templates/application.hbs
+++ b/ui/packages/consul-ui/app/templates/application.hbs
@@ -36,6 +36,8 @@ as |source|>
 />
 {{/if}}
 
+{{#if (not-eq route.currentName 'oauth-provider-debug')}}
+
 {{! redirect if we aren't on a URL with dc information }}
 {{#if (eq route.currentName 'index')}}
   {{did-insert (route-action 'replaceWith' 'dc.services.index'
@@ -156,4 +158,17 @@ as |dc dcs|}}
 </DataSource>
 {{/let}}
 {{/if}}
+{{else}}
+  {{! Routes with no main navigation }}
+  <Outlet
+    @name="application"
+    @model={{hash
+      user=(hash
+        token=token
+      )
+    }}
+  as |o|>
+    {{outlet}}
+  </Outlet>
+{{/if}}
 </Route>
diff --git a/ui/packages/consul-ui/app/templates/oauth-provider-debug.hbs b/ui/packages/consul-ui/app/templates/oauth-provider-debug.hbs
new file mode 100644
index 000000000..6c2db7d4f
--- /dev/null
+++ b/ui/packages/consul-ui/app/templates/oauth-provider-debug.hbs
@@ -0,0 +1,38 @@
+<Route
+  @name={{routeName}}
+as |route|>
+<div
+  style="width: 50%;margin: 0 auto;"
+>
+  <h1><route.Title @title="Mock OAuth Provider" /></h1>
+  <main>
+    <form
+      method="GET"
+      action={{redirect_uri}}
+    >
+{{#let (hash
+  state="state-123456789/abcdefghijklmnopqrstuvwxyz"
+  code="code-abcdefghijklmnopqrstuvwxyz/123456789"
+) as |item|}}
+      <TextInput
+        @name="state"
+        @label="State"
+        @item={{item}}
+        @help="The OIDC state value that will get passed through to Consul"
+      />
+      <TextInput
+        @name="code"
+        @label="Code"
+        @item={{item}}
+        @help="The OIDC code value that will get passed through to Consul"
+      />
+{{/let}}
+      <Action
+        @type="submit"
+      >
+        Login
+      </Action>
+    </form>
+  </main>
+</div>
+</Route>
diff --git a/ui/packages/consul-ui/config/environment.js b/ui/packages/consul-ui/config/environment.js
index 4d628dee0..73b7041c5 100644
--- a/ui/packages/consul-ui/config/environment.js
+++ b/ui/packages/consul-ui/config/environment.js
@@ -13,6 +13,8 @@ const repositorySHA = utils.repositorySHA;
 const binaryVersion = utils.binaryVersion(repositoryRoot);
 
 module.exports = function(environment, $ = process.env) {
+  // available environments
+  // ['production', 'development', 'staging', 'test'];
   const env = utils.env($);
   // basic 'get env var with fallback' accessor
 
@@ -23,10 +25,9 @@ module.exports = function(environment, $ = process.env) {
     locationType: 'fsm-with-optional',
     historySupportMiddleware: true,
 
-    // We use a complete dynamically (from Consul) configured torii provider.
-    // We provide this object here to prevent ember from giving a log message
-    // when starting ember up
-    torii: {},
+    torii: {
+      disableRedirectInitializer: false
+    },
 
     EmberENV: {
       FEATURES: {
@@ -128,8 +129,18 @@ module.exports = function(environment, $ = process.env) {
         }),
       });
       break;
+    case environment === 'development':
+      ENV = Object.assign({}, ENV, {
+        torii: {
+          disableRedirectInitializer: true
+        },
+      });
+      break;
     case environment === 'staging':
       ENV = Object.assign({}, ENV, {
+        torii: {
+          disableRedirectInitializer: true
+        },
         // On staging sites everything defaults to being turned on by
         // different staging sites can be built with certain features disabled
         // by setting an environment variable to 0 during building (e.g.
diff --git a/ui/packages/consul-ui/ember-cli-build.js b/ui/packages/consul-ui/ember-cli-build.js
index 51455cd1d..4e694d346 100644
--- a/ui/packages/consul-ui/ember-cli-build.js
+++ b/ui/packages/consul-ui/ember-cli-build.js
@@ -149,10 +149,15 @@ module.exports = function(defaults, $ = process.env) {
       outputFile: `assets/${item.name}/routes.js`,
     });
   });
-  ['consul-ui/services'].concat(devlike ? ['consul-ui/services-debug'] : []).forEach(item => {
-    app.import(`vendor/${item}.js`, {
-      outputFile: `assets/${item}.js`,
-    });
+  [
+    'consul-ui/services'
+    ].concat(devlike ? [
+      'consul-ui/services-debug',
+      'consul-ui/routes-debug'
+    ] : []).forEach(item => {
+      app.import(`vendor/${item}.js`, {
+        outputFile: `assets/${item}.js`,
+      });
   });
   // Use `app.import` to add additional libraries to the generated
   // output files.
diff --git a/ui/packages/consul-ui/lib/startup/templates/body.html.js b/ui/packages/consul-ui/lib/startup/templates/body.html.js
index 935a4257c..f5d164c50 100644
--- a/ui/packages/consul-ui/lib/startup/templates/body.html.js
+++ b/ui/packages/consul-ui/lib/startup/templates/body.html.js
@@ -46,6 +46,7 @@ ${
   environment === 'development' || environment === 'staging'
     ? `
   <script data-app-name="${appName}" data-${appName}-services src="${rootURL}assets/consul-ui/services-debug.js"></script>
+  <script data-app-name="${appName}" data-${appName}-routing src="${rootURL}assets/consul-ui/routes-debug.js"></script>
 ` : ``}
 ${
   environment === 'production'
diff --git a/ui/packages/consul-ui/mock-api/v1/acl/oidc/auth-url b/ui/packages/consul-ui/mock-api/v1/acl/oidc/auth-url
index 27bb33a91..2391ad2f9 100644
--- a/ui/packages/consul-ui/mock-api/v1/acl/oidc/auth-url
+++ b/ui/packages/consul-ui/mock-api/v1/acl/oidc/auth-url
@@ -1,3 +1,3 @@
 {
-  "AuthURL": "${env('CONSUL_OIDC_PROVIDER_URL')}&redirect_uri=${encodeURIComponent(http.body.RedirectURI)}&response_type=code&scope=openid"
+  "AuthURL": "${env('CONSUL_OIDC_PROVIDER_URL', 'http://localhost:4200/ui/oauth-provider-debug?client_id=oauth-double&nonce=1&state=123456789abc')}&redirect_uri=${encodeURIComponent(http.body.RedirectURI)}&response_type=code&scope=openid"
 }
diff --git a/ui/packages/consul-ui/mock-api/v1/acl/oidc/callback b/ui/packages/consul-ui/mock-api/v1/acl/oidc/callback
index 7ccf5fff7..7aedf0ba0 100644
--- a/ui/packages/consul-ui/mock-api/v1/acl/oidc/callback
+++ b/ui/packages/consul-ui/mock-api/v1/acl/oidc/callback
@@ -6,7 +6,7 @@
       typeof http.body.Namespace !== 'undefined' ? http.body.Namespace : 'default'
   }",
   "Local": false,
-  "Description": "${fake.lorem.sentence()}",
+  "Description": "AuthMethod: ${http.body.AuthMethod}; Code: ${http.body.Code}; State: ${http.body.State}; - ${fake.lorem.sentence()}",
   "Policies": [
     ${
       range(env('CONSUL_POLICY_COUNT', 3)).map(
diff --git a/ui/packages/consul-ui/vendor/consul-ui/routes-debug.js b/ui/packages/consul-ui/vendor/consul-ui/routes-debug.js
new file mode 100644
index 000000000..9e100a05f
--- /dev/null
+++ b/ui/packages/consul-ui/vendor/consul-ui/routes-debug.js
@@ -0,0 +1,19 @@
+(routes => routes({
+  ['oauth-provider-debug']: {
+    _options: {
+      path: '/oauth-provider-debug',
+      queryParams: {
+        redirect_uri: 'redirect_uri',
+        response_type: 'response_type',
+        scope: 'scope',
+      },
+    }
+  },
+}))(
+  (json, data = document.currentScript.dataset) => {
+    const appNameJS = data.appName.split('-')
+      .map((item, i) => i ? `${item.substr(0, 1).toUpperCase()}${item.substr(1)}` : item)
+      .join('');
+    data[`${appNameJS}Routes`] = JSON.stringify(json);
+  }
+);