diff --git a/.vscodeignore b/.vscodeignore
index 5f5fbfe7..1f52bda3 100644
--- a/.vscodeignore
+++ b/.vscodeignore
@@ -7,4 +7,4 @@ bower_components/**
 .sass-cache/**
 connect.lock/**
 coverage/*/**
-libpeerconnection.log
\ No newline at end of file
+libpeerconnection.log
diff --git a/app/app/routes/application.js b/app/app/routes/application.js
index 3d2c8398..ea955a81 100644
--- a/app/app/routes/application.js
+++ b/app/app/routes/application.js
@@ -20,11 +20,13 @@ const {
 export default Ember.Route.extend(ApplicationRouteMixin, {
 	appMeta: service(),
 	session: service(),
+
 	beforeModel() {
 		return this.get('appMeta').boot().then(data => {
-			if (data.allowAnonymousAccess) {
+			if (this.get('session.session.authenticator') !== "authenticator:documize" && data.allowAnonymousAccess) {
 				return this.get('session').authenticate('authenticator:anonymous', data);
 			}
+
 			return;
 		});
 	},
@@ -55,4 +57,4 @@ export default Ember.Route.extend(ApplicationRouteMixin, {
 			return true;
 		}
 	},
-});
+});
\ No newline at end of file
diff --git a/documize/database/scripts/autobuild/db_00000.sql b/documize/database/scripts/autobuild/db_00000.sql
index 710a3ecd..60568992 100644
--- a/documize/database/scripts/autobuild/db_00000.sql
+++ b/documize/database/scripts/autobuild/db_00000.sql
@@ -276,7 +276,5 @@ CREATE TABLE IF NOT EXISTS  `userconfig` (
 	`key` CHAR(225) NOT NULL,
 	`config` JSON,
 	UNIQUE INDEX `idx_userconfig_orguserkey` (`orgid`, `userid`, `key` ASC) )
-	DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
-
--- TODO insert userid into pagemeta table
--- ALTER TABLE `pagemeta` ADD `userid` CHAR(16) NOT NULL COLLATE utf8_bin AFTER `orgid`;
+DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci
+ENGINE = InnoDB;
diff --git a/jsconfig.json b/jsconfig.json
new file mode 100644
index 00000000..f2ea2998
--- /dev/null
+++ b/jsconfig.json
@@ -0,0 +1,7 @@
+{
+	"compilerOptions": {
+		"target": "es6",
+		"experimentalDecorators": true
+	},
+	"exclude": ["node_modules", "bower_components", "tmp", "vendor", ".git", "dist"]
+}
\ No newline at end of file