diff --git a/gui/app/services/app-meta.js b/gui/app/services/app-meta.js
index b8647c7d..391545a7 100644
--- a/gui/app/services/app-meta.js
+++ b/gui/app/services/app-meta.js
@@ -73,6 +73,8 @@ export default Service.extend({
 			return resolve(this);
 		}
 
+		requestedRoute = requestedRoute.toLowerCase().trim();
+
 		return this.get('ajax').request('public/meta').then((response) => {
 			this.setProperties(response);
 			this.set('version', 'v' + this.get('version'));
@@ -86,6 +88,7 @@ export default Service.extend({
 				});
 
 				this.get('localStorage').clearAll();
+				return resolve(this);
 			} else if (is.not.include(requestedUrl, '/auth/')) {
 				this.get('localStorage').storeSessionItem('entryUrl', requestedUrl);
 			}
diff --git a/gui/app/services/global.js b/gui/app/services/global.js
index 8cc26e23..2490c509 100644
--- a/gui/app/services/global.js
+++ b/gui/app/services/global.js
@@ -143,7 +143,6 @@ export default Service.extend({
 
 	// Run tenant level backup.
 	backup(spec) {
-
 		return new EmberPromise((resolve) => {
 			let url = this.get('appMeta.endpoint');
 			let token = this.get('sessionService.session.content.authenticated.token');
@@ -177,12 +176,5 @@ export default Service.extend({
 
 			xhr.send(JSON.stringify(spec));
 		});
-
-		// return this.get('ajax').raw(`global/backup`, {
-		// 	method: 'post',
-		// 	data: JSON.stringify(spec),
-		// 	contentType: 'json',
-		// 	dataType: 'text'
-		// });
 	}
 });
diff --git a/gui/app/services/session.js b/gui/app/services/session.js
index 6e85ec83..15284717 100644
--- a/gui/app/services/session.js
+++ b/gui/app/services/session.js
@@ -35,7 +35,7 @@ export default SimpleAuthSession.extend({
 	}),
 
 	user: computed('isAuthenticated', 'session.content.authenticated.user', function () {
-		if (this.get('isAuthenticated')) {
+		if (this.get('isAuthenticated') && !this.get('appMeta.secureMode')) {
 			let user = this.get('session.content.authenticated.user') || { id: '0' };
 			let data = this.get('store').normalize('user', user);
 			let um = this.get('store').push(data)
@@ -45,7 +45,7 @@ export default SimpleAuthSession.extend({
 	}),
 
 	authenticated: computed('session.content.authenticated.user', function () {
-		if (is.null(this.get('session.authenticator'))) return false;
+		if (is.null(this.get('session.authenticator')) || this.get('appMeta.secureMode')) return false;
 		return this.get('session.authenticator') !== 'authenticator:anonymous' && this.get('session.content.authenticated.user.id') !== '0';
 	}),