diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/arango/arango.js b/js/apps/system/_admin/aardvark/APP/frontend/js/arango/arango.js
index d67fc95f51..9baf27f2ce 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/arango/arango.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/arango/arango.js
@@ -132,19 +132,14 @@
     },
 
     currentDatabase: function (callback) {
-      $.ajax({
-        type: "GET",
-        cache: false,
-        url: this.databaseUrl("/_api/database/current"),
-        contentType: "application/json",
-        processData: false,
-        success: function(data) {
-          callback(false, data.result.name);
-        },
-        error: function(data) {
-          callback(true, data);
-        }
-      });
+      if (frontendConfig.db) {
+        callback(false, frontendConfig.db);
+      }
+      else {
+        callback(true, undefined);
+      }
+      console.log(frontendConfig.db);
+      return frontendConfig.db;
     },
 
     allHotkeys: {
@@ -501,6 +496,7 @@
             }
           },
           error: function(data) {
+            console.log("error");
             if (callback) {
               callback(true, data);
             }
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/models/arangoCollectionModel.js b/js/apps/system/_admin/aardvark/APP/frontend/js/models/arangoCollectionModel.js
index a9ce3ff430..2a1b7cc82c 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/models/arangoCollectionModel.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/models/arangoCollectionModel.js
@@ -36,7 +36,7 @@
       $.ajax({
         type: "GET",
         cache: false,
-        url: arangoHelper.databaseHelper("/_api/collection/" + this.get("id") + "/figures"),
+        url: arangoHelper.databaseUrl("/_api/collection/" + this.get("id") + "/figures"),
         contentType: "application/json",
         processData: false,
         success: function(data) {
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/models/currentDatabase.js b/js/apps/system/_admin/aardvark/APP/frontend/js/models/currentDatabase.js
index 345c5a34f6..64b724acf7 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/models/currentDatabase.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/models/currentDatabase.js
@@ -1,10 +1,10 @@
-/*global Backbone, window, arangoHelper */
+/*global Backbone, window, arangoHelper, frontendConfig */
 
 (function() {
   "use strict";
 
   window.CurrentDatabase = Backbone.Model.extend({
-    url: arangoHelper.databaseUrl("/_api/database/current"),
+    url: arangoHelper.databaseUrl("/_api/database/current", frontendConfig.db),
 
     parse: function(data) {
       return data.result;
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/routers/router.js b/js/apps/system/_admin/aardvark/APP/frontend/js/routers/router.js
index 8da55ad41e..775ef11b33 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/routers/router.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/routers/router.js
@@ -1,6 +1,6 @@
 /*jshint unused: false */
 /*global window, $, Backbone, document, arangoCollectionModel*/
-/*global arangoHelper, btoa, dashboardView, arangoDatabase, _*/
+/*global arangoHelper, btoa, dashboardView, arangoDatabase, _, frontendConfig */
 
 (function () {
   "use strict";
@@ -54,26 +54,45 @@
     },
 
     checkUser: function () {
+
       if (window.location.hash === '#login') {
         return;
       }
 
+      var startInit = function() {
+        this.initOnce();
+
+        //show hidden by default divs
+        $('.bodyWrapper').show();
+        $('.navbar').show();
+      }.bind(this);
+
       var callback = function(error, user) {
-        if (error || user === null) {
-          if (window.location.hash !== '#login') {
-            this.navigate("login", {trigger: true});
+        if (frontendConfig.authenticationEnabled) {
+          if (error || user === null) {
+            if (window.location.hash !== '#login') {
+              this.navigate("login", {trigger: true});
+            }
+          }
+          else {
+            startInit();
           }
         }
         else {
-          this.initOnce();
-
-          //show hidden by default divs
-          $('.bodyWrapper').show();
-          $('.navbar').show();
+          startInit();
         }
       }.bind(this);
 
-      this.userCollection.whoAmI(callback); 
+      if (frontendConfig.authenticationEnabled) {
+        this.userCollection.whoAmI(callback);
+      }
+      else {
+        this.initOnce();
+
+        //show hidden by default divs
+        $('.bodyWrapper').show();
+        $('.navbar').show();
+      }
     },
 
     waitForInit: function(origin, param1, param2) {
@@ -88,7 +107,7 @@
           if (param1 && param2) {
             origin(param1, param2, false);
           }
-        }, 250);
+        }, 350);
       } else {
         if (!param1) {
           origin(true);
@@ -123,7 +142,7 @@
 
         var callback = function(error, isCoordinator) {
           self = this;
-          if (isCoordinator) {
+          if (isCoordinator === true) {
             self.isCluster = true;
 
             self.coordinatorCollection.fetch({
@@ -209,11 +228,11 @@
 
     cluster: function (initialized) {
       this.checkUser();
-      if (!initialized || this.isCluster === undefined) {
+      if (!initialized) {
         this.waitForInit(this.cluster.bind(this));
         return;
       }
-      if (this.isCluster === false) {
+      if (this.isCluster === false || this.isCluster === undefined) {
         if (this.currentDB.get("name") === '_system') {
           this.routes[""] = 'dashboard';
           this.navigate("#dashboard", {trigger: true});
@@ -409,16 +428,16 @@
     login: function () {
 
       var callback = function(error, user) {
+        if (!this.loginView) {
+          this.loginView = new window.loginView({
+            collection: this.userCollection
+          });
+        }
         if (error || user === null) {
-          if (!this.loginView) {
-            this.loginView = new window.loginView({
-              collection: this.userCollection
-            });
-          }
           this.loginView.render();
         }
         else {
-          this.navigate("", {trigger: true});
+          this.loginView.render(true);
         }
       }.bind(this);
 
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/subNavigationView.ejs b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/subNavigationView.ejs
index 52aeb8c9ce..da57dba94a 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/subNavigationView.ejs
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/subNavigationView.ejs
@@ -4,22 +4,21 @@
     <li class="subMenuEntry pull-left">
       <div class="breadcrumb"></div>
     </li>
-    <li id="healthStatus" class="infoEntry subMenuEntry pull-right">
+    <li id="healthStatus" class="infoEntry subMenuEntry pull-right positive">
       <a class="info health-info">HEALTH: </a>
       <a class="state health-state">GOOD</a>
       <a class="icon health-icon">
         <i class="fa fa-check-circle"></i>
       </a>
     </li>
-    <li id="dbStatus" class="infoEntry subMenuEntry pull-right">
+    <li id="dbStatus" class="infoEntry subMenuEntry pull-right positive">
       <a class="info">DB:</a>
-      <a class="info"><%= currentDB.name %> </a>
+      <a class="state"><span><%= currentDB.name %></span></a>
+      <a class="icon db-icon default-icon">
+        <i class="fa fa-refresh"></i>      
+      </a>
     </li>
     <li id="userBar" class="infoEntry subMenuEntry pull-right" style="margin-right: 10px;">
-<!--
-      <div class="usermenu" id="userBar"></div>
-      <div class="notificationmenu" id="notificationBar"></div>
--->
     </li>
   </ul>
 
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/userBarView.ejs b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/userBarView.ejs
index 982b6d5a6f..a7939e0c45 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/userBarView.ejs
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/userBarView.ejs
@@ -1,9 +1,10 @@
 <script id="userBarView.ejs" type="text/template">
 
-  <a class="info">User: 
+  <a class="info default-icon">User: 
     <span class="toggle"> 
       <%=_.escape(username)%>
     </span>
+    <i id="userLogoutIcon" class="fa fa-power-off" aria-hidden="true"></i>
   </a>
 
   <ul id="userInfo" class="subBarDropdown">
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/dashboardView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/dashboardView.js
index 5733871010..902aa30104 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/dashboardView.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/dashboardView.js
@@ -1008,13 +1008,21 @@
       }
     }.bind(this);
 
-    if (window.App.currentDB.get("name") !== '_system') {
-      errorFunction();
-      return;
+    if (window.App.currentDB.get("name") === undefined) {
+      window.setTimeout(function() {
+        if (window.App.currentDB.get("name") !== '_system') {
+          errorFunction();
+          return;
+        }
+        //check if user has _system permission
+        this.options.database.hasSystemAccess(callback2);
+      }.bind(this), 300);
+    }
+    else {
+      //check if user has _system permission
+      this.options.database.hasSystemAccess(callback2);
     }
 
-    //check if user has _system permission
-    this.options.database.hasSystemAccess(callback2);
   }
 });
 }());
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/loginView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/loginView.js
index fb20422a6e..4b76201385 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/loginView.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/loginView.js
@@ -20,13 +20,37 @@
 
     template: templateEngine.createTemplate("loginView.ejs"),
 
-    render: function() {
+    render: function(loggedIn) {
+      var self = this;
+
       $(this.el).html(this.template.render({}));
       $(this.el2).hide();
       $(this.el3).hide();
-      $('.bodyWrapper').show();
 
-      $('#loginUsername').focus();
+      if (frontendConfig.authenticationEnabled && loggedIn !== true) {
+        $('#loginUsername').focus();
+      }
+      else {
+        $('#logout').hide();
+        $('.login-window #databases').css('height', '90px');
+        $('#loginForm').hide();
+        $('.login-window #databases').show();
+
+        $.ajax(arangoHelper.databaseUrl("/_api/database/")).success(function(data) {
+          //enable db select and login button
+          $('#loginDatabase').html('');
+          //fill select with allowed dbs
+          _.each(data.result, function(db) {
+            $('#loginDatabase').append(
+              '<option>' + db + '</option>'
+            ); 
+          });
+
+          self.renderDBS();
+        });
+      }
+
+      $('.bodyWrapper').show();
 
       return this;
     },
@@ -108,6 +132,9 @@
       e.preventDefault();
       var username = $('#loginUsername').val();
       var database = $('#loginDatabase').val();
+      console.log(window.App.dbSet);
+      window.App.dbSet = database;
+      console.log(window.App.dbSet);
 
       var callback2 = function(error) {
         if (error) {
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/navigationView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/navigationView.js
index 5ce70e7245..f3a783214b 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/navigationView.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/navigationView.js
@@ -20,6 +20,10 @@
     renderFirst: true,
     activeSubMenu: undefined,
 
+    changeDB: function() {
+      window.location.hash = '#login';
+    },
+
     initialize: function (options) {
 
       var self = this;
@@ -96,6 +100,10 @@
         $('.arangodbLogo').on('click', function() {
           self.selectMenuItem();
         });
+
+        $('#dbStatus').on('click', function() {
+          self.changeDB();
+        });
       }
 
       return this;
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/userBarView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/userBarView.js
index b65ad5ec01..1bb900279a 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/userBarView.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/userBarView.js
@@ -1,6 +1,6 @@
 /*jshint browser: true */
 /*jshint unused: false */
-/*global arangoHelper, Backbone, templateEngine, $, window*/
+/*global frontendConfig, arangoHelper, Backbone, templateEngine, $, window*/
 (function () {
   "use strict";
 
@@ -11,6 +11,7 @@
       "click .tab"                    : "navigateByTab",
       "mouseenter .dropdown"          : "showDropdown",
       "mouseleave .dropdown"          : "hideDropdown",
+      "click #userLogoutIcon"         : "userLogout",
       "click #userLogout"             : "userLogout"
     },
 
@@ -53,6 +54,11 @@
     },
 
     render: function () {
+
+      if (frontendConfig.authenticationEnabled === false) {
+        return;
+      }
+
       var self = this;
 
       var callback = function(error, username) {
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/userManagementView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/userManagementView.js
index c364dfb991..b4a66bf0d8 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/userManagementView.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/userManagementView.js
@@ -1,6 +1,6 @@
 /*jshint browser: true */
 /*jshint unused: false */
-/*global _, window, document, Backbone, EJS, SwaggerUi, hljs, $, arangoHelper, templateEngine,
+/*global frontendConfig, _, window, document, Backbone, EJS, SwaggerUi, hljs, $, arangoHelper, templateEngine,
   CryptoJS, Joi */
 (function() {
 
@@ -37,11 +37,13 @@
     initialize: function() {
       var self = this,
       callback = function(error, user) {
-        if (error || user === null) {
-          arangoHelper.arangoError("User", "Could not fetch user data");
-        }
-        else {
-          this.currentUser = this.collection.findWhere({user: user});
+        if (frontendConfig.authenticationEnabled === true) {
+          if (error || user === null) {
+            arangoHelper.arangoError("User", "Could not fetch user data");
+          }
+          else {
+            this.currentUser = this.collection.findWhere({user: user});
+          }
         }
       }.bind(this);