diff --git a/app/ux/Auth0.js b/app/ux/Auth0.js
index 12103654..83016f90 100644
--- a/app/ux/Auth0.js
+++ b/app/ux/Auth0.js
@@ -4,85 +4,78 @@ Ext.define('Rambox.ux.Auth0', {
 	// private
 	,lock: null
 	,auth0: null
+	,authService: null
 	,backupCurrent: false
 
 	,init: function() {
 		var me = this;
 
-		var Auth0Lock = require('auth0-lock')['default'];
 		var Auth0 = require('auth0-js');
-
-		// Auth0 Config
-		me.lock = new Auth0Lock(auth0Cfg.clientID, auth0Cfg.domain, {
-			 autoclose: true
-			,autofocus: true
-			,auth: {
-				 redirect: false
-				,params: {scope: 'openid offline_access'}
-			}
-			,theme: {
-				 logo: 'resources/Icon.png'
-				,primaryColor: '#0675A0'
-			}
-			,languageDictionary: {
-				title: 'Rambox Account'
-			}
-			,popupOptions: {
-				nodeIntegration: 'no'
-			}
-			,language: localStorage.getItem('locale-auth0') === null ? 'en' : localStorage.getItem('locale-auth0')
+		var _AuthService = require('./resources/js/AuthService');
+
+		me.authService = new _AuthService.default({
+			clientId: auth0Cfg.clientID,
+			authorizeEndpoint: 'https://'+auth0Cfg.domain+'/authorize',
+			audience: 'https://'+auth0Cfg.domain+'/userinfo',
+			scope: 'openid profile offline_access',
+			redirectUri: 'https://'+auth0Cfg.domain+'/mobile',
+			tokenEndpoint: 'https://'+auth0Cfg.domain+'/oauth/token'
 		});
 
 		me.auth0 = new Auth0.WebAuth({ clientID: auth0Cfg.clientID, domain : auth0Cfg.domain });
 
-		me.defineEvents();
+		//me.defineEvents();
 	}
 
-	,defineEvents: function() {
+	,onLogin: function(token, authWindow) {
 		var me = this;
 
-		me.lock.on("authenticated", function(authResult) {
-			me.lock.getProfile(authResult.idToken, function(err, profile) {
-				if ( err ) {
-					if ( err.error === 401 || err.error === 'Unauthorized' ) return me.renewToken(me.checkConfiguration);
-					Ext.Msg.hide();
-					return Ext.Msg.show({
-						 title: 'Error'
-						,message: 'There was an error getting the profile: ' + err.error_description
-						,icon: Ext.Msg.ERROR
-						,buttons: Ext.Msg.OK
-					});
-				}
-
-				// Display a spinner while waiting
-				Ext.Msg.wait(locale['app.window[29]'], locale['app.window[28]']);
-
-				// Google Analytics Event
-				ga_storage._trackEvent('Users', 'loggedIn');
-
-				// Set cookies to help Tooltip.io messages segmentation
-				Ext.util.Cookies.set('auth0', true);
-
-				// User is logged in
-				// Save the profile and JWT.
-				localStorage.setItem('profile', JSON.stringify(profile));
-				localStorage.setItem('id_token', authResult.idToken);
-				localStorage.setItem('refresh_token', authResult.refreshToken);
-
-				if ( !Ext.isEmpty(profile.user_metadata) && !Ext.isEmpty(profile.user_metadata.services) && !me.backupCurrent ) {
-					Ext.each(profile.user_metadata.services, function(s) {
-						var service = Ext.create('Rambox.model.Service', s);
-						service.save();
-						Ext.getStore('Services').add(service);
-					});
-
-					require('electron').remote.getCurrentWindow().reload();
-				}
+		authWindow.close();
 
+		me.auth0.client.userInfo(token.access_token, function(err, profile) {
+			if ( err ) {
+				if ( err.error === 401 || err.error === 'Unauthorized' ) return me.renewToken(me.checkConfiguration);
 				Ext.Msg.hide();
-				Ext.cq1('app-main').getViewModel().set('username', profile.name);
-				Ext.cq1('app-main').getViewModel().set('avatar', profile.picture);
-			});
+				return Ext.Msg.show({
+					 title: 'Error'
+					,message: 'There was an error getting the profile: ' + err.error_description
+					,icon: Ext.Msg.ERROR
+					,buttons: Ext.Msg.OK
+				});
+			}
+
+			profile.user_metadata = profile['https://rambox.pro/user_metadata'];
+			delete profile['https://rambox.pro/user_metadata'];
+
+			// Display a spinner while waiting
+			Ext.Msg.wait(locale['app.window[29]'], locale['app.window[28]']);
+
+			// Google Analytics Event
+			ga_storage._trackEvent('Users', 'loggedIn');
+
+			// Set cookies to help Tooltip.io messages segmentation
+			Ext.util.Cookies.set('auth0', true);
+
+			// User is logged in
+			// Save the profile and JWT.
+			localStorage.setItem('profile', JSON.stringify(profile));
+			localStorage.setItem('access_token', token.access_token);
+			localStorage.setItem('id_token', token.id_token);
+			localStorage.setItem('refresh_token', token.refresh_token);
+
+			if ( !Ext.isEmpty(profile.user_metadata) && !Ext.isEmpty(profile.user_metadata.services) && !me.backupCurrent ) {
+				Ext.each(profile.user_metadata.services, function(s) {
+					var service = Ext.create('Rambox.model.Service', s);
+					service.save();
+					Ext.getStore('Services').add(service);
+				});
+
+				require('electron').remote.getCurrentWindow().reload();
+			}
+
+			Ext.Msg.hide();
+			Ext.cq1('app-main').getViewModel().set('username', profile.name);
+			Ext.cq1('app-main').getViewModel().set('avatar', profile.picture);
 		});
 	}
 
@@ -147,7 +140,7 @@ Ext.define('Rambox.ux.Auth0', {
 	,restoreConfiguration: function() {
 		var me = this;
 
-		me.lock.getProfile(localStorage.getItem('id_token'), function (err, profile) {
+		me.auth0.client.userInfo(localStorage.getItem('access_token'), function(err, profile) {
 			if ( err ) {
 				if ( err.error === 401 || err.error === 'Unauthorized' ) return me.renewToken(me.checkConfiguration);
 				return Ext.Msg.show({
@@ -158,8 +151,12 @@ Ext.define('Rambox.ux.Auth0', {
 				});
 			}
 
+			profile.user_metadata = profile['https://rambox.pro/user_metadata'];
+			delete profile['https://rambox.pro/user_metadata'];
+
 			// First we remove all current services
 			Ext.cq1('app-main').getController().removeAllServices(false, function() {
+				if ( !profile.user_metadata || !profile.user_metadata.services ) return;
 				Ext.each(profile.user_metadata.services, function(s) {
 					var service = Ext.create('Rambox.model.Service', s);
 					service.save();
@@ -174,7 +171,7 @@ Ext.define('Rambox.ux.Auth0', {
 	,checkConfiguration: function() {
 		var me = this;
 
-		me.lock.getProfile(localStorage.getItem('id_token'), function (err, profile) {
+		me.auth0.client.userInfo(localStorage.getItem('access_token'), function(err, profile) {
 			if ( err ) {
 				if ( err.error === 401 || err.error === 'Unauthorized' ) return me.renewToken(me.checkConfiguration);
 				return Ext.Msg.show({
@@ -185,6 +182,9 @@ Ext.define('Rambox.ux.Auth0', {
 				});
 			}
 
+			profile.user_metadata = profile['https://rambox.pro/user_metadata'];
+			delete profile['https://rambox.pro/user_metadata'];
+
 			if ( !profile.user_metadata ) {
 				Ext.toast({
 					 html: 'You don\'t have any backup yet.'
@@ -243,7 +243,34 @@ Ext.define('Rambox.ux.Auth0', {
 	,login: function() {
 		var me = this;
 
-		me.lock.show();
+		var electron = require('electron').remote;
+		var authWindow = new electron.BrowserWindow({
+			 title: 'Rambox - Login'
+			,width: 400
+			,height: 600
+			,maximizable: false
+			,minimizable: false
+			,resizable: false
+			,center: true
+			,autoHideMenuBar: true
+			,skipTaskbar: true
+			,fullscreenable: false
+			,modal: true
+			,parent: require('electron').remote.getCurrentWindow()
+			,webPreferences: {
+				partition: 'persist:rambox'
+			}
+		});
+
+		authWindow.on('closed', function() {
+			authWindow = null;
+		});
+
+		authWindow.loadURL(me.authService.requestAuthCode());
+
+		authWindow.webContents.on('did-get-redirect-request', function(e, oldUrl, newUrl) {
+			me.authService.requestAccessCode(newUrl, me.onLogin.bind(me), authWindow);
+		});
 	}
 
 	,logout: function() {
diff --git a/app/view/main/MainController.js b/app/view/main/MainController.js
index 4c68d15f..75824b51 100644
--- a/app/view/main/MainController.js
+++ b/app/view/main/MainController.js
@@ -486,6 +486,7 @@ Ext.define('Rambox.view.main.MainController', {
 			Ext.cq1('app-main').getViewModel().set('avatar', '');
 
 			if ( Ext.isFunction(callback) ) callback();
+			Ext.Msg.hide();
 		}
 
 		if ( btn ) {
diff --git a/package-lock.json b/package-lock.json
index 21460c09..2c04d30d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -303,11 +303,6 @@
 			"integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
 			"dev": true
 		},
-		"asap": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-			"integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
-		},
 		"asar": {
 			"version": "0.12.4",
 			"resolved": "https://registry.npmjs.org/asar/-/asar-0.12.4.tgz",
@@ -327,14 +322,12 @@
 		"asn1": {
 			"version": "0.2.3",
 			"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-			"integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
-			"dev": true
+			"integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
 		},
 		"assert-plus": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-			"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-			"dev": true
+			"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
 		},
 		"async": {
 			"version": "2.6.1",
@@ -363,50 +356,29 @@
 			"dev": true
 		},
 		"auth0-js": {
-			"version": "8.12.3",
-			"resolved": "https://registry.npmjs.org/auth0-js/-/auth0-js-8.12.3.tgz",
-			"integrity": "sha1-+arOFCdDZwM5H1+aJz70MhM0FHw=",
+			"version": "9.7.3",
+			"resolved": "https://registry.npmjs.org/auth0-js/-/auth0-js-9.7.3.tgz",
+			"integrity": "sha512-iZAqoN4EbsNCS/3VkFPNb4glTyj8hq57T7gcUF+XH8Rua7hBTUzpb101K9zqcdUIBilIdF9XBLCTJ4JGgZ/oFA==",
 			"requires": {
 				"base64-js": "^1.2.0",
-				"idtoken-verifier": "^1.1.0",
+				"idtoken-verifier": "^1.2.0",
+				"js-cookie": "^2.2.0",
 				"qs": "^6.4.0",
-				"superagent": "^3.3.1",
+				"superagent": "^3.8.2",
 				"url-join": "^1.1.0",
 				"winchan": "^0.2.0"
-			}
-		},
-		"auth0-lock": {
-			"version": "10.22.0",
-			"resolved": "https://registry.npmjs.org/auth0-lock/-/auth0-lock-10.22.0.tgz",
-			"integrity": "sha1-JqjA0CRQO24u85YMME6aqMKKb70=",
-			"requires": {
-				"auth0-js": "~8.7.0",
-				"blueimp-md5": "2.3.1",
-				"fbjs": "^0.3.1",
-				"idtoken-verifier": "^1.0.1",
-				"immutable": "^3.7.3",
-				"jsonp": "^0.2.0",
-				"password-sheriff": "^1.1.0",
-				"prop-types": "^15.5.10",
-				"react": "^15.6.1 || ^16.0.0",
-				"react-dom": "^15.6.1 || ^16.0.0",
-				"react-transition-group": "^1.2.0",
-				"superagent": "^3.3.1",
-				"trim": "0.0.1",
-				"url-join": "^1.1.0"
 			},
 			"dependencies": {
-				"auth0-js": {
-					"version": "8.7.0",
-					"resolved": "https://registry.npmjs.org/auth0-js/-/auth0-js-8.7.0.tgz",
-					"integrity": "sha1-Z5vxjFdKVATkbwXazK2rpMb3dOs=",
+				"idtoken-verifier": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/idtoken-verifier/-/idtoken-verifier-1.2.0.tgz",
+					"integrity": "sha512-8jmmFHwdPz8L73zGNAXHHOV9yXNC+Z0TUBN5rafpoaFaLFltlIFr1JkQa3FYAETP23eSsulVw0sBiwrE8jqbUg==",
 					"requires": {
 						"base64-js": "^1.2.0",
-						"idtoken-verifier": "^1.0.2",
-						"qs": "^6.4.0",
-						"superagent": "^3.3.1",
-						"url-join": "^1.1.0",
-						"winchan": "^0.2.0"
+						"crypto-js": "^3.1.9-1",
+						"jsbn": "^0.1.0",
+						"superagent": "^3.8.2",
+						"url-join": "^1.1.0"
 					}
 				}
 			}
@@ -461,8 +433,12 @@
 		"aws-sign2": {
 			"version": "0.7.0",
 			"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-			"integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-			"dev": true
+			"integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
+		},
+		"aws4": {
+			"version": "1.8.0",
+			"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
+			"integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
 		},
 		"babel-runtime": {
 			"version": "6.26.0",
@@ -497,7 +473,6 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
 			"integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
-			"dev": true,
 			"optional": true,
 			"requires": {
 				"tweetnacl": "^0.14.3"
@@ -564,8 +539,7 @@
 		"bluebird": {
 			"version": "3.5.1",
 			"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
-			"integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
-			"dev": true
+			"integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
 		},
 		"bluebird-lst": {
 			"version": "1.0.5",
@@ -576,11 +550,6 @@
 				"bluebird": "^3.5.1"
 			}
 		},
-		"blueimp-md5": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.3.1.tgz",
-			"integrity": "sha1-mSpnN3M7naHt1kFVDcOsqy6c/Fo="
-		},
 		"boxen": {
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz",
@@ -769,8 +738,7 @@
 		"caseless": {
 			"version": "0.12.0",
 			"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-			"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-			"dev": true
+			"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
 		},
 		"chai": {
 			"version": "3.5.0",
@@ -814,11 +782,6 @@
 				}
 			}
 		},
-		"chain-function": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/chain-function/-/chain-function-1.0.0.tgz",
-			"integrity": "sha1-DUqzfn4Y6tC9xHuSB2QRjOWHM9w="
-		},
 		"chainsaw": {
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
@@ -892,8 +855,7 @@
 		"co": {
 			"version": "4.6.0",
 			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-			"integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-			"dev": true
+			"integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
 		},
 		"code-point-at": {
 			"version": "1.1.0",
@@ -916,6 +878,14 @@
 			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
 			"dev": true
 		},
+		"combined-stream": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
+			"integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
+			"requires": {
+				"delayed-stream": "~1.0.0"
+			}
+		},
 		"commander": {
 			"version": "2.11.0",
 			"resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
@@ -1058,11 +1028,6 @@
 			"resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz",
 			"integrity": "sha1-Qa1XsbVVlR7BcUEqgZQrHoIA00o="
 		},
-		"core-js": {
-			"version": "1.2.7",
-			"resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
-			"integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
-		},
 		"core-util-is": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
@@ -1464,6 +1429,11 @@
 				}
 			}
 		},
+		"crypto": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/crypto/-/crypto-1.0.1.tgz",
+			"integrity": "sha512-VxBKmeNcqQdiUQUW2Tzq0t377b54N2bMtXO/qiLa+6eRRmmC4qT3D4OnTGoT/U6O9aklQ/jTwbOtRMTTY8G0Ig=="
+		},
 		"crypto-js": {
 			"version": "3.1.9-1",
 			"resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.9-1.tgz",
@@ -1538,7 +1508,6 @@
 			"version": "1.14.1",
 			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
 			"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-			"dev": true,
 			"requires": {
 				"assert-plus": "^1.0.0"
 			}
@@ -1547,6 +1516,7 @@
 			"version": "2.6.9",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
 			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"dev": true,
 			"requires": {
 				"ms": "2.0.0"
 			}
@@ -1637,11 +1607,6 @@
 				}
 			}
 		},
-		"dom-helpers": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.2.1.tgz",
-			"integrity": "sha1-MgPgf+0he9H0JLAZc1WC/Deyglo="
-		},
 		"dot-prop": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
@@ -1673,7 +1638,6 @@
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
 			"integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
-			"dev": true,
 			"optional": true,
 			"requires": {
 				"jsbn": "~0.1.0"
@@ -2806,14 +2770,6 @@
 				}
 			}
 		},
-		"encoding": {
-			"version": "0.1.12",
-			"resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
-			"integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
-			"requires": {
-				"iconv-lite": "~0.4.13"
-			}
-		},
 		"end-of-stream": {
 			"version": "1.4.1",
 			"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
@@ -2941,8 +2897,7 @@
 		"extsprintf": {
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-			"dev": true
+			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
 		},
 		"fast-deep-equal": {
 			"version": "2.0.1",
@@ -2953,20 +2908,7 @@
 		"fast-json-stable-stringify": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-			"integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
-			"dev": true
-		},
-		"fbjs": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.3.2.tgz",
-			"integrity": "sha1-AzpUBZUIS13jUJpAXQbxoqjlufs=",
-			"requires": {
-				"core-js": "^1.0.0",
-				"loose-envify": "^1.0.0",
-				"promise": "^7.0.3",
-				"ua-parser-js": "^0.7.9",
-				"whatwg-fetch": "^0.9.0"
-			}
+			"integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
 		},
 		"fd-slicer": {
 			"version": "1.0.1",
@@ -2998,8 +2940,7 @@
 		"forever-agent": {
 			"version": "0.6.1",
 			"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-			"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-			"dev": true
+			"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
 		},
 		"form-data": {
 			"version": "2.3.2",
@@ -3109,7 +3050,6 @@
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
 			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-			"dev": true,
 			"requires": {
 				"assert-plus": "^1.0.0"
 			}
@@ -3204,7 +3144,6 @@
 			"version": "5.1.0",
 			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.0.tgz",
 			"integrity": "sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==",
-			"dev": true,
 			"requires": {
 				"ajv": "^5.3.0",
 				"har-schema": "^2.0.0"
@@ -3214,7 +3153,6 @@
 					"version": "5.5.2",
 					"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
 					"integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
-					"dev": true,
 					"requires": {
 						"co": "^4.6.0",
 						"fast-deep-equal": "^1.0.0",
@@ -3225,20 +3163,17 @@
 				"fast-deep-equal": {
 					"version": "1.1.0",
 					"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-					"integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
-					"dev": true
+					"integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ="
 				},
 				"har-schema": {
 					"version": "2.0.0",
 					"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-					"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-					"dev": true
+					"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
 				},
 				"json-schema-traverse": {
 					"version": "0.3.1",
 					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-					"integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
-					"dev": true
+					"integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
 				}
 			}
 		},
@@ -3264,7 +3199,6 @@
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
 			"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-			"dev": true,
 			"requires": {
 				"assert-plus": "^1.0.0",
 				"jsprim": "^1.2.2",
@@ -3274,19 +3208,8 @@
 		"iconv-lite": {
 			"version": "0.4.18",
 			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz",
-			"integrity": "sha512-sr1ZQph3UwHTR0XftSbK85OvBbxe/abLGzEnPENCQwmHf7sck8Oyu4ob3LgBxWWxRoM+QszeUyl7jbqapu2TqA=="
-		},
-		"idtoken-verifier": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/idtoken-verifier/-/idtoken-verifier-1.1.0.tgz",
-			"integrity": "sha1-Gt0wElqj5eWFnRUrNWqQio4utaA=",
-			"requires": {
-				"base64-js": "^1.2.0",
-				"crypto-js": "^3.1.9-1",
-				"jsbn": "^0.1.0",
-				"superagent": "^3.3.1",
-				"url-join": "^1.1.0"
-			}
+			"integrity": "sha512-sr1ZQph3UwHTR0XftSbK85OvBbxe/abLGzEnPENCQwmHf7sck8Oyu4ob3LgBxWWxRoM+QszeUyl7jbqapu2TqA==",
+			"dev": true
 		},
 		"ieee754": {
 			"version": "1.1.12",
@@ -3294,11 +3217,6 @@
 			"integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==",
 			"dev": true
 		},
-		"immutable": {
-			"version": "3.8.2",
-			"resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.2.tgz",
-			"integrity": "sha1-wkOZUUVbs5kT2vKBN28VMOEErfM="
-		},
 		"import-lazy": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
@@ -3465,13 +3383,13 @@
 		"is-stream": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-			"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+			"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+			"dev": true
 		},
 		"is-typedarray": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-			"dev": true
+			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
 		},
 		"is-utf8": {
 			"version": "0.2.1",
@@ -3500,32 +3418,15 @@
 			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
 			"dev": true
 		},
-		"isomorphic-fetch": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
-			"integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
-			"requires": {
-				"node-fetch": "^1.0.1",
-				"whatwg-fetch": ">=0.10.0"
-			},
-			"dependencies": {
-				"whatwg-fetch": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz",
-					"integrity": "sha1-nITsLc9oGH/wC8ZOEnS0QhduHIQ="
-				}
-			}
-		},
 		"isstream": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-			"dev": true
+			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
 		},
-		"js-tokens": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-			"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
+		"js-cookie": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.0.tgz",
+			"integrity": "sha1-Gywnmm7s44ChIWi5JIUmWzWx7/s="
 		},
 		"js-yaml": {
 			"version": "3.12.0",
@@ -3545,8 +3446,7 @@
 		"json-schema": {
 			"version": "0.2.3",
 			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-			"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-			"dev": true
+			"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
 		},
 		"json-schema-traverse": {
 			"version": "0.4.1",
@@ -3557,8 +3457,7 @@
 		"json-stringify-safe": {
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-			"dev": true
+			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
 		},
 		"json5": {
 			"version": "1.0.1",
@@ -3586,19 +3485,10 @@
 				"graceful-fs": "^4.1.6"
 			}
 		},
-		"jsonp": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/jsonp/-/jsonp-0.2.1.tgz",
-			"integrity": "sha1-pltPoPEL2nGaBUQep7lMVfPhW64=",
-			"requires": {
-				"debug": "^2.1.3"
-			}
-		},
 		"jsprim": {
 			"version": "1.4.1",
 			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
 			"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-			"dev": true,
 			"requires": {
 				"assert-plus": "1.0.0",
 				"extsprintf": "1.3.0",
@@ -3720,8 +3610,7 @@
 		"lodash": {
 			"version": "4.17.10",
 			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
-			"integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==",
-			"dev": true
+			"integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
 		},
 		"lodash.assign": {
 			"version": "4.2.0",
@@ -3765,14 +3654,6 @@
 			"integrity": "sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=",
 			"dev": true
 		},
-		"loose-envify": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
-			"integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
-			"requires": {
-				"js-tokens": "^3.0.0"
-			}
-		},
 		"loud-rejection": {
 			"version": "1.6.0",
 			"resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
@@ -4096,15 +3977,6 @@
 			"integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
 			"dev": true
 		},
-		"node-fetch": {
-			"version": "1.7.3",
-			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
-			"integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
-			"requires": {
-				"encoding": "^0.1.11",
-				"is-stream": "^1.0.1"
-			}
-		},
 		"nopt": {
 			"version": "3.0.6",
 			"resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
@@ -4182,13 +4054,13 @@
 		"oauth-sign": {
 			"version": "0.9.0",
 			"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-			"integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-			"dev": true
+			"integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
 		},
 		"object-assign": {
 			"version": "4.1.1",
 			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-			"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+			"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+			"dev": true
 		},
 		"object-keys": {
 			"version": "0.4.0",
@@ -4309,11 +4181,6 @@
 				"error-ex": "^1.2.0"
 			}
 		},
-		"password-sheriff": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/password-sheriff/-/password-sheriff-1.1.0.tgz",
-			"integrity": "sha1-/bPD2EWgo8kt5CKyrZNGzginFBM="
-		},
 		"path-exists": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
@@ -4362,6 +4229,11 @@
 			"integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
 			"dev": true
 		},
+		"performance-now": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+			"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
+		},
 		"pify": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
@@ -4440,40 +4312,6 @@
 				"through2": "~0.2.3"
 			}
 		},
-		"promise": {
-			"version": "7.3.1",
-			"resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
-			"integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
-			"requires": {
-				"asap": "~2.0.3"
-			}
-		},
-		"prop-types": {
-			"version": "15.6.0",
-			"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz",
-			"integrity": "sha1-zq8IMCL8RrSjX2nhPvda7Q1jmFY=",
-			"requires": {
-				"fbjs": "^0.8.16",
-				"loose-envify": "^1.3.1",
-				"object-assign": "^4.1.1"
-			},
-			"dependencies": {
-				"fbjs": {
-					"version": "0.8.16",
-					"resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.16.tgz",
-					"integrity": "sha1-XmdDL1UNxBtXK/VYR7ispk5TN9s=",
-					"requires": {
-						"core-js": "^1.0.0",
-						"isomorphic-fetch": "^2.1.1",
-						"loose-envify": "^1.0.0",
-						"object-assign": "^4.1.0",
-						"promise": "^7.1.1",
-						"setimmediate": "^1.0.5",
-						"ua-parser-js": "^0.7.9"
-					}
-				}
-			}
-		},
 		"pseudomap": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
@@ -4483,14 +4321,12 @@
 		"psl": {
 			"version": "1.1.29",
 			"resolved": "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz",
-			"integrity": "sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==",
-			"dev": true
+			"integrity": "sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ=="
 		},
 		"punycode": {
 			"version": "1.4.1",
 			"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-			"integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-			"dev": true
+			"integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
 		},
 		"pupa": {
 			"version": "1.0.0",
@@ -4534,72 +4370,6 @@
 				}
 			}
 		},
-		"react": {
-			"version": "16.0.0",
-			"resolved": "https://registry.npmjs.org/react/-/react-16.0.0.tgz",
-			"integrity": "sha1-zn348ZQbA28Cssyp29DLHw6FXi0=",
-			"requires": {
-				"fbjs": "^0.8.16",
-				"loose-envify": "^1.1.0",
-				"object-assign": "^4.1.1",
-				"prop-types": "^15.6.0"
-			},
-			"dependencies": {
-				"fbjs": {
-					"version": "0.8.16",
-					"resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.16.tgz",
-					"integrity": "sha1-XmdDL1UNxBtXK/VYR7ispk5TN9s=",
-					"requires": {
-						"core-js": "^1.0.0",
-						"isomorphic-fetch": "^2.1.1",
-						"loose-envify": "^1.0.0",
-						"object-assign": "^4.1.0",
-						"promise": "^7.1.1",
-						"setimmediate": "^1.0.5",
-						"ua-parser-js": "^0.7.9"
-					}
-				}
-			}
-		},
-		"react-dom": {
-			"version": "16.0.0",
-			"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.0.0.tgz",
-			"integrity": "sha1-nMMHnD3NcNTG4BuEqrKn40wwP1g=",
-			"requires": {
-				"fbjs": "^0.8.16",
-				"loose-envify": "^1.1.0",
-				"object-assign": "^4.1.1",
-				"prop-types": "^15.6.0"
-			},
-			"dependencies": {
-				"fbjs": {
-					"version": "0.8.16",
-					"resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.16.tgz",
-					"integrity": "sha1-XmdDL1UNxBtXK/VYR7ispk5TN9s=",
-					"requires": {
-						"core-js": "^1.0.0",
-						"isomorphic-fetch": "^2.1.1",
-						"loose-envify": "^1.0.0",
-						"object-assign": "^4.1.0",
-						"promise": "^7.1.1",
-						"setimmediate": "^1.0.5",
-						"ua-parser-js": "^0.7.9"
-					}
-				}
-			}
-		},
-		"react-transition-group": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-1.2.1.tgz",
-			"integrity": "sha512-CWaL3laCmgAFdxdKbhhps+c0HRGF4c+hdM4H23+FI1QBNUyx/AMeIJGWorehPNSaKnQNOAxL7PQmqMu78CDj3Q==",
-			"requires": {
-				"chain-function": "^1.0.0",
-				"dom-helpers": "^3.2.0",
-				"loose-envify": "^1.3.1",
-				"prop-types": "^15.5.6",
-				"warning": "^3.0.0"
-			}
-		},
 		"read-config-file": {
 			"version": "3.1.2",
 			"resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-3.1.2.tgz",
@@ -4739,7 +4509,6 @@
 			"version": "2.88.0",
 			"resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
 			"integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-			"dev": true,
 			"requires": {
 				"aws-sign2": "~0.7.0",
 				"aws4": "^1.8.0",
@@ -4763,72 +4532,55 @@
 				"uuid": "^3.3.2"
 			},
 			"dependencies": {
-				"aws4": {
-					"version": "1.8.0",
-					"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
-					"integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
-					"dev": true
-				},
-				"combined-stream": {
-					"version": "1.0.6",
-					"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
-					"integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
-					"dev": true,
-					"requires": {
-						"delayed-stream": "~1.0.0"
-					}
-				},
 				"extend": {
 					"version": "3.0.2",
 					"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-					"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-					"dev": true
+					"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
 				},
 				"mime-db": {
 					"version": "1.36.0",
 					"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.36.0.tgz",
-					"integrity": "sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==",
-					"dev": true
+					"integrity": "sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw=="
 				},
 				"mime-types": {
 					"version": "2.1.20",
 					"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.20.tgz",
 					"integrity": "sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==",
-					"dev": true,
 					"requires": {
 						"mime-db": "~1.36.0"
 					}
 				},
-				"performance-now": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-					"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-					"dev": true
-				},
 				"qs": {
 					"version": "6.5.2",
 					"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-					"integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-					"dev": true
+					"integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
 				},
 				"safe-buffer": {
 					"version": "5.1.2",
 					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-					"dev": true
-				},
-				"tough-cookie": {
-					"version": "2.4.3",
-					"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-					"integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
-					"dev": true,
-					"requires": {
-						"psl": "^1.1.24",
-						"punycode": "^1.4.1"
-					}
+					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
 				}
 			}
 		},
+		"request-promise": {
+			"version": "4.2.2",
+			"resolved": "https://registry.npmjs.org/request-promise/-/request-promise-4.2.2.tgz",
+			"integrity": "sha1-0epG1lSm7k+O5qT+oQGMIpEZBLQ=",
+			"requires": {
+				"bluebird": "^3.5.0",
+				"request-promise-core": "1.1.1",
+				"stealthy-require": "^1.1.0",
+				"tough-cookie": ">=2.3.3"
+			}
+		},
+		"request-promise-core": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.1.tgz",
+			"integrity": "sha1-Pu4AssWqgyOc+wTFcA2jb4HNCLY=",
+			"requires": {
+				"lodash": "^4.13.1"
+			}
+		},
 		"require-directory": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -4982,8 +4734,7 @@
 		"safer-buffer": {
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-			"dev": true
+			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
 		},
 		"sanitize-filename": {
 			"version": "1.6.1",
@@ -5021,11 +4772,6 @@
 			"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
 			"dev": true
 		},
-		"setimmediate": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-			"integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
-		},
 		"shebang-command": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
@@ -5214,7 +4960,6 @@
 			"version": "1.14.2",
 			"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz",
 			"integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=",
-			"dev": true,
 			"requires": {
 				"asn1": "~0.2.3",
 				"assert-plus": "^1.0.0",
@@ -5233,6 +4978,11 @@
 			"integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI=",
 			"dev": true
 		},
+		"stealthy-require": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
+			"integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks="
+		},
 		"string-width": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
@@ -5529,17 +5279,21 @@
 				}
 			}
 		},
+		"tough-cookie": {
+			"version": "2.4.3",
+			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+			"integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+			"requires": {
+				"psl": "^1.1.24",
+				"punycode": "^1.4.1"
+			}
+		},
 		"traverse": {
 			"version": "0.3.9",
 			"resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
 			"integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=",
 			"dev": true
 		},
-		"trim": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
-			"integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0="
-		},
 		"trim-newlines": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
@@ -5559,7 +5313,6 @@
 			"version": "0.6.0",
 			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
 			"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-			"dev": true,
 			"requires": {
 				"safe-buffer": "^5.0.1"
 			}
@@ -5568,7 +5321,6 @@
 			"version": "0.14.5",
 			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
 			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-			"dev": true,
 			"optional": true
 		},
 		"typedarray": {
@@ -5577,11 +5329,6 @@
 			"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
 			"dev": true
 		},
-		"ua-parser-js": {
-			"version": "0.7.14",
-			"resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.14.tgz",
-			"integrity": "sha1-EQ1T+kw/MmwSEpK76skE0uAzh8o="
-		},
 		"unique-string": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
@@ -5699,8 +5446,7 @@
 		"uuid": {
 			"version": "3.3.2",
 			"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-			"integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
-			"dev": true
+			"integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
 		},
 		"validate-npm-package-license": {
 			"version": "3.0.4",
@@ -5716,21 +5462,12 @@
 			"version": "1.10.0",
 			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
 			"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-			"dev": true,
 			"requires": {
 				"assert-plus": "^1.0.0",
 				"core-util-is": "1.0.2",
 				"extsprintf": "^1.2.0"
 			}
 		},
-		"warning": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz",
-			"integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=",
-			"requires": {
-				"loose-envify": "^1.0.0"
-			}
-		},
 		"wdio-dot-reporter": {
 			"version": "0.0.10",
 			"resolved": "https://registry.npmjs.org/wdio-dot-reporter/-/wdio-dot-reporter-0.0.10.tgz",
@@ -5810,11 +5547,6 @@
 			"integrity": "sha1-7vikudVYzEla06mit1FZfs2a9pA=",
 			"dev": true
 		},
-		"whatwg-fetch": {
-			"version": "0.9.0",
-			"resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-0.9.0.tgz",
-			"integrity": "sha1-DjaExsuZlbQ+/J3wPkw2XZX9nMA="
-		},
 		"which": {
 			"version": "1.3.1",
 			"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
diff --git a/package.json b/package.json
index 43a6a740..a8ed1413 100644
--- a/package.json
+++ b/package.json
@@ -109,13 +109,15 @@
 	},
 	"dependencies": {
 		"@exponent/electron-cookies": "2.0.0",
-		"auth0-js": "^8.12.3",
-		"auth0-lock": "^10.22.0",
+		"auth0-js": "^9.7.3",
 		"auto-launch-patched": "5.0.2",
+		"crypto": "^1.0.1",
 		"electron-config": "0.2.1",
 		"electron-context-menu": "0.9.1",
 		"electron-is-dev": "^0.3.0",
 		"mime": "^2.3.1",
+		"request": "^2.88.0",
+		"request-promise": "^4.2.2",
 		"rimraf": "2.6.1",
 		"tmp": "0.0.28"
 	}
diff --git a/resources/js/AuthService.js b/resources/js/AuthService.js
new file mode 100644
index 00000000..d646737c
--- /dev/null
+++ b/resources/js/AuthService.js
@@ -0,0 +1,151 @@
+// Credits: github.com/adeperio and github.com/uotw
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+	value: true
+});
+
+var _createClass = function() {
+	function defineProperties(target, props) {
+		for (var i = 0; i < props.length; i++) {
+			var descriptor = props[i];
+			descriptor.enumerable = descriptor.enumerable || false;
+			descriptor.configurable = true;
+			if ("value" in descriptor) descriptor.writable = true;
+			Object.defineProperty(target, descriptor.key, descriptor);
+		}
+	}
+	return function(Constructor, protoProps, staticProps) {
+		if (protoProps) defineProperties(Constructor.prototype, protoProps);
+		if (staticProps) defineProperties(Constructor, staticProps);
+		return Constructor;
+	};
+}();
+
+var _request = require('request');
+
+var _request2 = _interopRequireDefault(_request);
+
+var _crypto = require('crypto');
+
+var _crypto2 = _interopRequireDefault(_crypto);
+
+var _requestPromise = require('request-promise');
+
+var _requestPromise2 = _interopRequireDefault(_requestPromise);
+
+function _interopRequireDefault(obj) {
+	return obj && obj.__esModule ? obj : {
+		default: obj
+	};
+}
+
+function _classCallCheck(instance, Constructor) {
+	if (!(instance instanceof Constructor)) {
+		throw new TypeError("Cannot call a class as a function");
+	}
+}
+
+//https://auth0.com/docs/api-auth/tutorials/authorization-code-grant-pkce
+var AuthService = function() {
+	function AuthService(config) {
+		_classCallCheck(this, AuthService);
+
+		this.config = config;
+	}
+
+	_createClass(AuthService, [{
+		key: 'requestAuthCode',
+		value: function requestAuthCode() {
+			this.challengePair = AuthService.getPKCEChallengePair();
+			return this.getAuthoriseUrl(this.challengePair);
+		}
+	}, {
+		key: 'requestAccessCode',
+		value: function requestAccessCode(callbackUrl, onSuccess, authWindow) {
+			var _this = this;
+
+			return new Promise(function(resolve, reject) {
+
+				if (_this.isValidAccessCodeCallBackUrl(callbackUrl)) {
+
+					var authCode = AuthService.getParameterByName('code', callbackUrl);
+
+					if (authCode != null) {
+						var _verifier = _this.challengePair.verifier;
+						var options = _this.getTokenPostRequest(authCode, _verifier);
+
+						return (0, _requestPromise2.default)(options).then(function(response) {
+							onSuccess(JSON.parse(response), authWindow);
+						}).catch(function(err) {
+							if (err) throw new Error(err);
+						});
+					} else {
+						reject('Could not parse the authorization code');
+					}
+				} else {
+					//reject('Access code callback url not expected.');
+				}
+			});
+		}
+	}, {
+		key: 'getAuthoriseUrl',
+		value: function getAuthoriseUrl(challengePair) {
+			return this.config.authorizeEndpoint + '?scope=' + this.config.scope + '&response_type=code&client_id=' + this.config.clientId + '&code_challenge=' + challengePair.challenge + '&code_challenge_method=S256&redirect_uri=' + this.config.redirectUri;
+		}
+	}, {
+		key: 'getTokenPostRequest',
+		value: function getTokenPostRequest(authCode, verifier) {
+			return {
+				method: 'POST',
+				url: this.config.tokenEndpoint,
+				headers: {
+					'content-type': 'application/json'
+				},
+				body: '{"grant_type":"authorization_code",\n              "client_id": "' + this.config.clientId + '",\n              "code_verifier": "' + verifier + '",\n              "code": "' + authCode + '",\n              "redirect_uri":"' + this.config.redirectUri + '"\n            }'
+			};
+		}
+	}, {
+		key: 'isValidAccessCodeCallBackUrl',
+		value: function isValidAccessCodeCallBackUrl(callbackUrl) {
+			//console.log(this.config.redirectUri);
+			return callbackUrl.indexOf(this.config.redirectUri) > -1;
+		}
+	}], [{
+		key: 'getPKCEChallengePair',
+		value: function getPKCEChallengePair() {
+			var verifier = AuthService.base64URLEncode(_crypto2.default.randomBytes(32));
+			var challenge = AuthService.base64URLEncode(AuthService.sha256(verifier));
+			return {
+				verifier: verifier,
+				challenge: challenge
+			};
+		}
+	}, {
+		key: 'getParameterByName',
+		value: function getParameterByName(name, url) {
+
+			name = name.replace(/[\[\]]/g, "\\$&");
+			var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"),
+			results = regex.exec(url);
+			if (!results) return null;
+			if (!results[2]) return '';
+			return decodeURIComponent(results[2].replace(/\+/g, " "));
+		}
+	}, {
+		key: 'base64URLEncode',
+		value: function base64URLEncode(str) {
+
+			return str.toString('base64').replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
+		}
+	}, {
+		key: 'sha256',
+		value: function sha256(buffer) {
+			return _crypto2.default.createHash('sha256').update(buffer).digest();
+		}
+	}]);
+
+	return AuthService;
+}();
+
+exports.default = AuthService;