diff --git a/dist/redux-oidc.js b/dist/redux-oidc.js
index 8e22f4f..42f58d0 100644
--- a/dist/redux-oidc.js
+++ b/dist/redux-oidc.js
@@ -1 +1 @@
-!function(e,r){if("object"==typeof exports&&"object"==typeof module)module.exports=r(require("react"),require("immutable"),require("oidc-client"));else if("function"==typeof define&&define.amd)define(["react","immutable","oidc-client"],r);else{var t="object"==typeof exports?r(require("react"),require("immutable"),require("oidc-client")):r(e.react,e.immutable,e["oidc-client"]);for(var n in t)("object"==typeof exports?exports:e)[n]=t[n]}}(this,function(e,r,t){return function(e){function r(n){if(t[n])return t[n].exports;var o=t[n]={exports:{},id:n,loaded:!1};return e[n].call(o.exports,o,o.exports,r),o.loaded=!0,o.exports}var t={};return r.m=e,r.c=t,r.p="",r(0)}([function(e,r,t){e.exports=t(8)},function(e,r){"use strict";Object.defineProperty(r,"__esModule",{value:!0}),r.STORAGE_KEY="oidc.expired",r.USER_EXPIRED="redux-oidc/USER_EXPIRED",r.REDIRECT_SUCCESS="redux-oidc/REDIRECT_SUCCESS",r.USER_LOADED="redux-oidc/USER_LOADED",r.SILENT_RENEW_ERROR="redux-oidc/SILENT_RENEW_ERROR",r.SESSION_TERMINATED="redux-oidc/SESSION_TERMINATED",r.USER_EXPIRING="redux-oidc/USER_EXPIRING",r.USER_FOUND="redux-oidc/USER_FOUND",r.LOADING_USER="redux-oidc/LOADING_USER"},function(e,r,t){"use strict";function n(){return{type:l.USER_EXPIRED}}function o(e){return{type:l.REDIRECT_SUCCESS,payload:e}}function i(e){return{type:l.USER_FOUND,payload:e}}function s(e){return{type:l.SILENT_RENEW_ERROR,payload:e}}function u(){return{type:l.SESSION_TERMINATED}}function a(){return{type:l.USER_EXPIRING}}function c(){return{type:l.LOADING_USER}}Object.defineProperty(r,"__esModule",{value:!0}),r.userExpired=n,r.redirectSuccess=o,r.userFound=i,r.silentRenewError=s,r.sessionTerminated=u,r.userExpiring=a,r.loadingUser=c;var l=t(1)},function(e,r,t){"use strict";function n(e){return new o.UserManager(e)}Object.defineProperty(r,"__esModule",{value:!0}),r["default"]=n;var o=t(13)},function(e,r){e.exports=require("react")},function(e,r,t){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}function o(e,r){if(!(e instanceof r))throw new TypeError("Cannot call a class as a function")}function i(e,r){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!r||"object"!=typeof r&&"function"!=typeof r?e:r}function s(e,r){if("function"!=typeof r&&null!==r)throw new TypeError("Super expression must either be null or a function, not "+typeof r);e.prototype=Object.create(r&&r.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),r&&(Object.setPrototypeOf?Object.setPrototypeOf(e,r):e.__proto__=r)}Object.defineProperty(r,"__esModule",{value:!0});var u=function(){function e(e,r){for(var t=0;t<r.length;t++){var n=r[t];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}return function(r,t,n){return t&&e(r.prototype,t),n&&e(r,n),r}}(),a=t(4),c=n(a),l=t(1),d=(t(2),function(e){function r(){var e,t,n,s;o(this,r);for(var u=arguments.length,a=Array(u),c=0;c<u;c++)a[c]=arguments[c];return t=n=i(this,(e=Object.getPrototypeOf(r)).call.apply(e,[this].concat(a))),n.onRedirectSuccess=function(e){localStorage.removeItem(l.STORAGE_KEY),n.props.successCallback(e)},n.onRedirectError=function(e){if(localStorage.removeItem(l.STORAGE_KEY),!n.props.errorCallback)throw new Error("Error handling redirect callback: "+e.message);n.props.errorCallback(e)},s=t,i(n,s)}return s(r,e),u(r,[{key:"componentDidMount",value:function(){var e=this;this.context.userManager.signinRedirectCallback().then(function(r){return e.onRedirectSuccess(r)})["catch"](function(r){return e.onRedirectError(r)})}},{key:"render",value:function(){return c["default"].createElement("div",null,this.props.children||this.defaultContent)}},{key:"defaultContent",get:function(){return c["default"].createElement("div",null,"Redirecting...")}}]),r}(c["default"].Component));d.propTypes={successCallback:a.PropTypes.func.isRequired,errorCallback:a.PropTypes.func},d.contextTypes={userManager:a.PropTypes.object},r["default"]=d},function(e,r,t){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}function o(e,r){if(!(e instanceof r))throw new TypeError("Cannot call a class as a function")}function i(e,r){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!r||"object"!=typeof r&&"function"!=typeof r?e:r}function s(e,r){if("function"!=typeof r&&null!==r)throw new TypeError("Super expression must either be null or a function, not "+typeof r);e.prototype=Object.create(r&&r.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),r&&(Object.setPrototypeOf?Object.setPrototypeOf(e,r):e.__proto__=r)}Object.defineProperty(r,"__esModule",{value:!0});var u=function(){function e(e,r){for(var t=0;t<r.length;t++){var n=r[t];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}return function(r,t,n){return t&&e(r.prototype,t),n&&e(r,n),r}}(),a=t(4),c=n(a),l=t(2),d=function(e){function r(e){o(this,r);var t=i(this,Object.getPrototypeOf(r).call(this,e));return t.onUserLoaded=function(e){t.props.store.dispatch((0,l.userFound)(e))},t.onSilentRenewError=function(e){t.props.store.dispatch((0,l.silentRenewError)(e))},t.onAccessTokenExpired=function(){t.props.store.dispatch((0,l.userExpired)())},t.onUserUnloaded=function(){t.props.store.dispatch((0,l.sessionTerminated)())},t.onAccessTokenExpiring=function(){t.props.store.dispatch((0,l.userExpiring)())},t.userManager=e.userManager,t}return s(r,e),u(r,[{key:"getChildContext",value:function(){return{userManager:this.userManager}}},{key:"componentWillMount",value:function(){this.userManager.events.addUserLoaded(this.onUserLoaded),this.userManager.events.addSilentRenewError(this.onSilentRenewError),this.userManager.events.addAccessTokenExpired(this.onAccessTokenExpired),this.userManager.events.addAccessTokenExpiring(this.onAccessTokenExpiring),this.userManager.events.addUserUnloaded(this.onUserUnloaded)}},{key:"componentWillUnmount",value:function(){this.userManager.events.removeUserLoaded(this.onUserLoaded),this.userManager.events.removeSilentRenewError(this.onSilentRenewError),this.userManager.events.removeAccessTokenExpired(this.onAccessTokenExpired),this.userManager.events.removeAccessTokenExpiring(this.onAccessTokenExpiring),this.userManager.events.removeUserUnloaded(this.onUserUnloaded)}},{key:"render",value:function(){return c["default"].Children.only(this.props.children)}}]),r}(c["default"].Component);d.propTypes={userManager:a.PropTypes.object.isRequired,store:a.PropTypes.object.isRequired},d.childContextTypes={userManager:a.PropTypes.object},r["default"]=d},function(e,r,t){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}function o(){var e=(0,s["default"])();e.signinSilentCallback()}Object.defineProperty(r,"__esModule",{value:!0}),r["default"]=o;var i=t(3),s=n(i)},function(e,r,t){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}Object.defineProperty(r,"__esModule",{value:!0}),r.loadingUser=r.userExpiring=r.sessionTerminated=r.silentRenewError=r.userFound=r.redirectSuccess=r.userExpired=r.LOADING_USER=r.USER_EXPIRING=r.SESSION_TERMINATED=r.SILENT_RENEW_ERROR=r.USER_NOT_FOUND=r.USER_FOUND=r.REDIRECT_SUCCESS=r.USER_EXPIRED=r.OidcProvider=r.reducer=r.immutableReducer=r.CallbackComponent=r.processSilentRenew=r.createUserManager=void 0;var o=t(9),i=n(o);r.createUserManager=t(3)["default"],r.processSilentRenew=t(7)["default"],r.CallbackComponent=t(5)["default"],r.immutableReducer=t(10)["default"],r.reducer=t(11)["default"],r.OidcProvider=t(6)["default"],r.USER_EXPIRED=t(1).USER_EXPIRED,r.REDIRECT_SUCCESS=t(1).REDIRECT_SUCCESS,r.USER_FOUND=t(1).USER_FOUND,r.USER_NOT_FOUND=t(1).USER_NOT_FOUND,r.SILENT_RENEW_ERROR=t(1).SILENT_RENEW_ERROR,r.SESSION_TERMINATED=t(1).SESSION_TERMINATED,r.USER_EXPIRING=t(1).USER_EXPIRING,r.LOADING_USER=t(1).LOADING_USER,r.userExpired=t(2).userExpired,r.redirectSuccess=t(2).redirectSuccess,r.userFound=t(2).userFound,r.silentRenewError=t(2).silentRenewError,r.sessionTerminated=t(2).sessionTerminated,r.userExpiring=t(2).userExpiring,r.loadingUser=t(2).loadingUser,r["default"]=i["default"]},function(e,r,t){"use strict";function n(e){r.storedUser=l=e}function o(){r.storedUser=l=null}function i(e,t,n,o,i){return n&&!n.expired?(localStorage.removeItem(a.STORAGE_KEY),r.storedUser=l=n,e((0,c.userFound)(n)),e(i)):(e((0,c.userExpired)()),o?void t.signinRedirect({data:{redirectUrl:window.location.href}}):e(i))}function s(e){throw localStorage.removeItem(a.STORAGE_KEY),new Error("Error loading user: "+e.message)}function u(e,r,t,n){if(!e)throw new Error("You must provide a user manager!");if(!n)throw new Error("You must provide the callback route!");if(r&&"function"==typeof r||(r=function(e,r){return!0}),localStorage.getItem(a.STORAGE_KEY)&&window.location.pathname.indexOf(n)===-1){localStorage.removeItem(a.STORAGE_KEY);for(var o in localStorage)o.indexOf("oidc")!==-1&&o.indexOf("oidc.user")===-1&&localStorage.removeItem(o)}return function(n){return function(o){return function(u){return!r(n.getState(),u)||localStorage.getItem(a.STORAGE_KEY)?o(u):l&&!l.expired?o(u):(o((0,c.loadingUser)()),localStorage.setItem(a.STORAGE_KEY,!0),void e.getUser().then(function(r){return i(o,e,r,t,u)})["catch"](s))}}}}Object.defineProperty(r,"__esModule",{value:!0}),r.storedUser=void 0,r.setStoredUser=n,r.removeStoredUser=o,r.getUserSuccessCallback=i,r.getUserErrorCallback=s,r["default"]=u;var a=t(1),c=t(2),l=r.storedUser=null},function(e,r,t){"use strict";function n(){var e=arguments.length<=0||void 0===arguments[0]?s:arguments[0],r=arguments[1];switch(r.type){case i.USER_EXPIRED:return e.set("isLoadingUser",!1);case i.SILENT_RENEW_ERROR:return e.set("isLoadingUser",!1);case i.SESSION_TERMINATED:return(0,o.fromJS)({user:null,isLoadingUser:!1});case i.REDIRECT_SUCCESS:case i.USER_FOUND:return(0,o.fromJS)({user:r.payload,isLoadingUser:!1});case i.LOADING_USER:return e.set("isLoadingUser",!0);default:return e}}Object.defineProperty(r,"__esModule",{value:!0}),r["default"]=n;var o=t(12),i=t(1),s=(0,o.fromJS)({user:null,isLoadingUser:!1})},function(e,r,t){"use strict";function n(){var e=arguments.length<=0||void 0===arguments[0]?s:arguments[0],r=arguments[1];switch(r.type){case i.USER_EXPIRED:return Object.assign({},o({},e),{isLoadingUser:!1});case i.SILENT_RENEW_ERROR:return Object.assign({},o({},e),{isLoadingUser:!1});case i.SESSION_TERMINATED:return Object.assign({},o({},e),{user:null,isLoadingUser:!1});case i.REDIRECT_SUCCESS:case i.USER_FOUND:return Object.assign({},o({},e),{user:r.payload,isLoadingUser:!1});case i.LOADING_USER:return Object.assign({},o({},e),{isLoadingUser:!0});default:return e}}Object.defineProperty(r,"__esModule",{value:!0});var o=Object.assign||function(e){for(var r=1;r<arguments.length;r++){var t=arguments[r];for(var n in t)Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n])}return e};r["default"]=n;var i=t(1),s={user:null,isLoadingUser:!1}},function(e,r){e.exports=require("immutable")},function(e,r){e.exports=require("oidc-client")}])});
\ No newline at end of file
+!function(e,r){if("object"==typeof exports&&"object"==typeof module)module.exports=r(require("react"),require("immutable"),require("oidc-client"));else if("function"==typeof define&&define.amd)define(["react","immutable","oidc-client"],r);else{var t="object"==typeof exports?r(require("react"),require("immutable"),require("oidc-client")):r(e.react,e.immutable,e["oidc-client"]);for(var n in t)("object"==typeof exports?exports:e)[n]=t[n]}}(this,function(e,r,t){return function(e){function r(n){if(t[n])return t[n].exports;var o=t[n]={exports:{},id:n,loaded:!1};return e[n].call(o.exports,o,o.exports,r),o.loaded=!0,o.exports}var t={};return r.m=e,r.c=t,r.p="",r(0)}([function(e,r,t){e.exports=t(8)},function(e,r){"use strict";Object.defineProperty(r,"__esModule",{value:!0}),r.STORAGE_KEY="oidc.expired",r.USER_EXPIRED="redux-oidc/USER_EXPIRED",r.REDIRECT_SUCCESS="redux-oidc/REDIRECT_SUCCESS",r.USER_LOADED="redux-oidc/USER_LOADED",r.SILENT_RENEW_ERROR="redux-oidc/SILENT_RENEW_ERROR",r.SESSION_TERMINATED="redux-oidc/SESSION_TERMINATED",r.USER_EXPIRING="redux-oidc/USER_EXPIRING",r.USER_FOUND="redux-oidc/USER_FOUND",r.LOADING_USER="redux-oidc/LOADING_USER"},function(e,r,t){"use strict";function n(){return{type:l.USER_EXPIRED}}function o(e){return{type:l.REDIRECT_SUCCESS,payload:e}}function i(e){return{type:l.USER_FOUND,payload:e}}function s(e){return{type:l.SILENT_RENEW_ERROR,payload:e}}function u(){return{type:l.SESSION_TERMINATED}}function a(){return{type:l.USER_EXPIRING}}function c(){return{type:l.LOADING_USER}}Object.defineProperty(r,"__esModule",{value:!0}),r.userExpired=n,r.redirectSuccess=o,r.userFound=i,r.silentRenewError=s,r.sessionTerminated=u,r.userExpiring=a,r.loadingUser=c;var l=t(1)},function(e,r,t){"use strict";function n(e){return new o.UserManager(e)}Object.defineProperty(r,"__esModule",{value:!0}),r["default"]=n;var o=t(13)},function(e,r){e.exports=require("react")},function(e,r,t){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}function o(e,r){if(!(e instanceof r))throw new TypeError("Cannot call a class as a function")}function i(e,r){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!r||"object"!=typeof r&&"function"!=typeof r?e:r}function s(e,r){if("function"!=typeof r&&null!==r)throw new TypeError("Super expression must either be null or a function, not "+typeof r);e.prototype=Object.create(r&&r.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),r&&(Object.setPrototypeOf?Object.setPrototypeOf(e,r):e.__proto__=r)}Object.defineProperty(r,"__esModule",{value:!0});var u=function(){function e(e,r){for(var t=0;t<r.length;t++){var n=r[t];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}return function(r,t,n){return t&&e(r.prototype,t),n&&e(r,n),r}}(),a=t(4),c=n(a),l=t(1),d=(t(2),function(e){function r(){var e,t,n,s;o(this,r);for(var u=arguments.length,a=Array(u),c=0;c<u;c++)a[c]=arguments[c];return t=n=i(this,(e=Object.getPrototypeOf(r)).call.apply(e,[this].concat(a))),n.onRedirectSuccess=function(e){localStorage.removeItem(l.STORAGE_KEY),n.props.successCallback(e)},n.onRedirectError=function(e){if(localStorage.removeItem(l.STORAGE_KEY),!n.props.errorCallback)throw new Error("Error handling redirect callback: "+e.message);n.props.errorCallback(e)},s=t,i(n,s)}return s(r,e),u(r,[{key:"componentDidMount",value:function(){var e=this;this.context.userManager.signinRedirectCallback(this.props.route).then(function(r){return e.onRedirectSuccess(r)})["catch"](function(r){return e.onRedirectError(r)})}},{key:"render",value:function(){return c["default"].createElement("div",null,this.props.children||this.defaultContent)}},{key:"defaultContent",get:function(){return c["default"].createElement("div",null,"Redirecting...")}}]),r}(c["default"].Component));d.propTypes={successCallback:a.PropTypes.func.isRequired,errorCallback:a.PropTypes.func,route:a.PropTypes.string},d.contextTypes={userManager:a.PropTypes.object},r["default"]=d},function(e,r,t){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}function o(e,r){if(!(e instanceof r))throw new TypeError("Cannot call a class as a function")}function i(e,r){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!r||"object"!=typeof r&&"function"!=typeof r?e:r}function s(e,r){if("function"!=typeof r&&null!==r)throw new TypeError("Super expression must either be null or a function, not "+typeof r);e.prototype=Object.create(r&&r.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),r&&(Object.setPrototypeOf?Object.setPrototypeOf(e,r):e.__proto__=r)}Object.defineProperty(r,"__esModule",{value:!0});var u=function(){function e(e,r){for(var t=0;t<r.length;t++){var n=r[t];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}return function(r,t,n){return t&&e(r.prototype,t),n&&e(r,n),r}}(),a=t(4),c=n(a),l=t(2),d=function(e){function r(e){o(this,r);var t=i(this,Object.getPrototypeOf(r).call(this,e));return t.onUserLoaded=function(e){t.props.store.dispatch((0,l.userFound)(e))},t.onSilentRenewError=function(e){t.props.store.dispatch((0,l.silentRenewError)(e))},t.onAccessTokenExpired=function(){t.props.store.dispatch((0,l.userExpired)())},t.onUserUnloaded=function(){t.props.store.dispatch((0,l.sessionTerminated)())},t.onAccessTokenExpiring=function(){t.props.store.dispatch((0,l.userExpiring)())},t.userManager=e.userManager,t}return s(r,e),u(r,[{key:"getChildContext",value:function(){return{userManager:this.userManager}}},{key:"componentWillMount",value:function(){this.userManager.events.addUserLoaded(this.onUserLoaded),this.userManager.events.addSilentRenewError(this.onSilentRenewError),this.userManager.events.addAccessTokenExpired(this.onAccessTokenExpired),this.userManager.events.addAccessTokenExpiring(this.onAccessTokenExpiring),this.userManager.events.addUserUnloaded(this.onUserUnloaded)}},{key:"componentWillUnmount",value:function(){this.userManager.events.removeUserLoaded(this.onUserLoaded),this.userManager.events.removeSilentRenewError(this.onSilentRenewError),this.userManager.events.removeAccessTokenExpired(this.onAccessTokenExpired),this.userManager.events.removeAccessTokenExpiring(this.onAccessTokenExpiring),this.userManager.events.removeUserUnloaded(this.onUserUnloaded)}},{key:"render",value:function(){return c["default"].Children.only(this.props.children)}}]),r}(c["default"].Component);d.propTypes={userManager:a.PropTypes.object.isRequired,store:a.PropTypes.object.isRequired},d.childContextTypes={userManager:a.PropTypes.object},r["default"]=d},function(e,r,t){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}function o(){var e=(0,s["default"])();e.signinSilentCallback()}Object.defineProperty(r,"__esModule",{value:!0}),r["default"]=o;var i=t(3),s=n(i)},function(e,r,t){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}Object.defineProperty(r,"__esModule",{value:!0}),r.loadingUser=r.userExpiring=r.sessionTerminated=r.silentRenewError=r.userFound=r.redirectSuccess=r.userExpired=r.LOADING_USER=r.USER_EXPIRING=r.SESSION_TERMINATED=r.SILENT_RENEW_ERROR=r.USER_NOT_FOUND=r.USER_FOUND=r.REDIRECT_SUCCESS=r.USER_EXPIRED=r.OidcProvider=r.reducer=r.immutableReducer=r.CallbackComponent=r.processSilentRenew=r.createUserManager=void 0;var o=t(9),i=n(o);r.createUserManager=t(3)["default"],r.processSilentRenew=t(7)["default"],r.CallbackComponent=t(5)["default"],r.immutableReducer=t(10)["default"],r.reducer=t(11)["default"],r.OidcProvider=t(6)["default"],r.USER_EXPIRED=t(1).USER_EXPIRED,r.REDIRECT_SUCCESS=t(1).REDIRECT_SUCCESS,r.USER_FOUND=t(1).USER_FOUND,r.USER_NOT_FOUND=t(1).USER_NOT_FOUND,r.SILENT_RENEW_ERROR=t(1).SILENT_RENEW_ERROR,r.SESSION_TERMINATED=t(1).SESSION_TERMINATED,r.USER_EXPIRING=t(1).USER_EXPIRING,r.LOADING_USER=t(1).LOADING_USER,r.userExpired=t(2).userExpired,r.redirectSuccess=t(2).redirectSuccess,r.userFound=t(2).userFound,r.silentRenewError=t(2).silentRenewError,r.sessionTerminated=t(2).sessionTerminated,r.userExpiring=t(2).userExpiring,r.loadingUser=t(2).loadingUser,r["default"]=i["default"]},function(e,r,t){"use strict";function n(e){r.storedUser=l=e}function o(){r.storedUser=l=null}function i(e,t,n,o,i){return n&&!n.expired?(localStorage.removeItem(a.STORAGE_KEY),r.storedUser=l=n,e((0,c.userFound)(n)),e(i)):(e((0,c.userExpired)()),o?void t.signinRedirect({data:{redirectUrl:window.location.pathname}}):e(i))}function s(e){throw localStorage.removeItem(a.STORAGE_KEY),new Error("Error loading user: "+e.message)}function u(e,r,t,n){if(!e||!e.getUser||!e.signinRedirect)throw new Error("You must provide a user manager!");if("string"!=typeof n)throw new Error("You must provide the callback route!");if(r&&"function"==typeof r||(r=function(e,r){return!0}),localStorage.getItem(a.STORAGE_KEY)&&window.location.pathname.indexOf(n)===-1){localStorage.removeItem(a.STORAGE_KEY);for(var o in localStorage)o.indexOf("oidc")!==-1&&o.indexOf("oidc.user")===-1&&localStorage.removeItem(o)}return function(n){return function(o){return function(u){return!r(n.getState(),u)||localStorage.getItem(a.STORAGE_KEY)?o(u):l&&!l.expired?o(u):(o((0,c.loadingUser)()),localStorage.setItem(a.STORAGE_KEY,!0),void e.getUser().then(function(r){return i(o,e,r,t,u)})["catch"](s))}}}}Object.defineProperty(r,"__esModule",{value:!0}),r.storedUser=void 0,r.setStoredUser=n,r.removeStoredUser=o,r.getUserSuccessCallback=i,r.getUserErrorCallback=s,r["default"]=u;var a=t(1),c=t(2),l=r.storedUser=null},function(e,r,t){"use strict";function n(){var e=arguments.length<=0||void 0===arguments[0]?s:arguments[0],r=arguments[1];switch(r.type){case i.USER_EXPIRED:return e.set("isLoadingUser",!1);case i.SILENT_RENEW_ERROR:return e.set("isLoadingUser",!1);case i.SESSION_TERMINATED:return(0,o.fromJS)({user:null,isLoadingUser:!1});case i.REDIRECT_SUCCESS:case i.USER_FOUND:return(0,o.fromJS)({user:r.payload,isLoadingUser:!1});case i.LOADING_USER:return e.set("isLoadingUser",!0);default:return e}}Object.defineProperty(r,"__esModule",{value:!0}),r["default"]=n;var o=t(12),i=t(1),s=(0,o.fromJS)({user:null,isLoadingUser:!1})},function(e,r,t){"use strict";function n(){var e=arguments.length<=0||void 0===arguments[0]?s:arguments[0],r=arguments[1];switch(r.type){case i.USER_EXPIRED:return Object.assign({},o({},e),{isLoadingUser:!1});case i.SILENT_RENEW_ERROR:return Object.assign({},o({},e),{isLoadingUser:!1});case i.SESSION_TERMINATED:return Object.assign({},o({},e),{user:null,isLoadingUser:!1});case i.REDIRECT_SUCCESS:case i.USER_FOUND:return Object.assign({},o({},e),{user:r.payload,isLoadingUser:!1});case i.LOADING_USER:return Object.assign({},o({},e),{isLoadingUser:!0});default:return e}}Object.defineProperty(r,"__esModule",{value:!0});var o=Object.assign||function(e){for(var r=1;r<arguments.length;r++){var t=arguments[r];for(var n in t)Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n])}return e};r["default"]=n;var i=t(1),s={user:null,isLoadingUser:!1}},function(e,r){e.exports=require("immutable")},function(e,r){e.exports=require("oidc-client")}])});
\ No newline at end of file
diff --git a/package.json b/package.json
index e11076d..f24b9f2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "redux-oidc",
-  "version": "2.2.0-beta.2",
+  "version": "2.2.0-beta.3",
   "description": "A package for managing OpenID Connect authentication in redux apps",
   "main": "dist/redux-oidc.js",
   "scripts": {
diff --git a/src/CallbackComponent.js b/src/CallbackComponent.js
index 3ec0e38..e3cd2a9 100644
--- a/src/CallbackComponent.js
+++ b/src/CallbackComponent.js
@@ -6,6 +6,7 @@ class CallbackComponent extends React.Component {
   static propTypes = {
     successCallback: PropTypes.func.isRequired,
     errorCallback: PropTypes.func,
+    route: PropTypes.string
   };
 
   static contextTypes = {
@@ -13,7 +14,7 @@ class CallbackComponent extends React.Component {
   };
 
   componentDidMount() {
-    this.context.userManager.signinRedirectCallback()
+    this.context.userManager.signinRedirectCallback(this.props.route)
       .then((user) => this.onRedirectSuccess(user))
       .catch((error) => this.onRedirectError(error));
   }
diff --git a/src/oidcMiddleware.js b/src/oidcMiddleware.js
index ded700d..8fda4ae 100644
--- a/src/oidcMiddleware.js
+++ b/src/oidcMiddleware.js
@@ -22,7 +22,7 @@ export function getUserSuccessCallback(next, userManager, user, triggerAuthFlow,
     if (triggerAuthFlow) {
       // IF: auth flow should be triggered
       userManager.signinRedirect({ data: {
-          redirectUrl: window.location.href
+          redirectUrl: window.location.pathname
         }
       });
     } else {
@@ -45,11 +45,11 @@ export function getUserErrorCallback(error) {
 
 // the middleware creator function
 export default function createOidcMiddleware(userManager, shouldValidate, triggerAuthFlow, callbackRoute) {
-  if (!userManager) {
+  if (!userManager || !userManager.getUser || !userManager.signinRedirect) {
     throw new Error('You must provide a user manager!');
   }
 
-  if (!callbackRoute) {
+  if (typeof(callbackRoute) !== 'string') {
     throw new Error('You must provide the callback route!');
   }
 
diff --git a/tests/callbackComponent.test.js b/tests/callbackComponent.test.js
index 4f4cf5c..e073b13 100644
--- a/tests/callbackComponent.test.js
+++ b/tests/callbackComponent.test.js
@@ -88,4 +88,15 @@ describe('<CallbackComponent />', () => {
     expect(() => component.onRedirectError(error)).toThrow(/error/);
     expect(removeItemStub.calledWith(STORAGE_KEY)).toEqual(true);
   });
+
+  it('should call the signinSilentCallback with a route when it has been provided', () => {
+    const route = '/some/route';
+    props = { ...props, route };
+    component = new CallbackComponent(props);
+    component.context = Object.assign({}, { ...component.context }, { ...contextMock });
+
+    component.componentDidMount();
+
+    expect(signinRedirectCallbackStub.calledWith(route)).toEqual(true);
+  });
 });
diff --git a/tests/oidcMiddleware.test.js b/tests/oidcMiddleware.test.js
index 56b0d1f..f10cdcf 100644
--- a/tests/oidcMiddleware.test.js
+++ b/tests/oidcMiddleware.test.js
@@ -23,13 +23,12 @@ describe('createOidcMiddleware()', () => {
   let getStateStub;
   let action;
   let stateMock;
-  let href = 'http://some.url.com';
   let pathname = '/callback';
   let callbackRoute = '/callback';
 
   beforeEach(() => {
     windowMock = {
-      location: { href, pathname }
+      location: { pathname }
     };
     oldWindow = window;
     window = windowMock;
@@ -97,6 +96,17 @@ describe('createOidcMiddleware()', () => {
     expect(nextFunction.length).toEqual(1);
   });
 
+  it('should throw an error when no user manager has been provided', () => {
+    expect(() => {createOidcMiddleware(null, null, null, callbackRoute)}).toThrow(/You must provide a user manager!/);
+    expect(() => {createOidcMiddleware({}, null, null, callbackRoute)}).toThrow(/You must provide a user manager!/);
+    expect(() => {createOidcMiddleware('userManager', null, null, callbackRoute)}).toThrow(/You must provide a user manager!/);
+  });
+
+  it('should throw an error when no callback route has been provided', () =>  {
+    expect(() => {createOidcMiddleware(userManagerMock, null, null, null)}).toThrow(/You must provide the callback route!/);
+    expect(() => {createOidcMiddleware(userManagerMock, null, null, {})}).toThrow(/You must provide the callback route!/);
+  });
+
   it('should call the shouldValidate() function with the redux state and dispatched action', () => {
     const shouldValidate = sinon.stub();
     createOidcMiddleware(userManagerMock, shouldValidate, null, callbackRoute)(storeMock)(nextStub)(action);
@@ -178,7 +188,7 @@ describe('createOidcMiddleware()', () => {
     const result = getUserSuccessCallback(nextStub, userManagerMock, user, true, action);
     const stateData = {
       data: {
-        redirectUrl: href
+        redirectUrl: pathname
       }
     };
 
@@ -230,8 +240,7 @@ describe('createOidcMiddleware()', () => {
 
     windowMock = {
       location: {
-        pathname: '/someRoute',
-        href
+        pathname: '/someRoute'
       }
     };
     window = windowMock;