diff --git a/frontend-js/src/main/js/ServerConnector.js b/frontend-js/src/main/js/ServerConnector.js
index 4b020e2468714bdb0c93d4d991d7c40d45e66f37..4c75b8841205a83b06cea80b2e3ae56816e0b194 100644
--- a/frontend-js/src/main/js/ServerConnector.js
+++ b/frontend-js/src/main/js/ServerConnector.js
@@ -135,11 +135,6 @@ ServerConnector.sendRequest = function (params) {
     return Promise.reject(new Error("Only two arguments are supported"));
   }
 
-  if (self.getSessionData().getToken() === undefined) {
-    self.getSessionData().setLogin(undefined);
-    window.location.reload(false);
-  }
-
   var description = params.url;
   if (params.description !== undefined) {
     description = params.description;
@@ -1378,7 +1373,6 @@ ServerConnector.login = function (login, password) {
   } else {
     params.login = "anonymous";
   }
-  self.getSessionData().setToken("");
   return self.sendPostRequest(self.loginUrl(), params).then(function () {
     self.getSessionData().setLogin(params.login);
     return Promise.resolve(self.getSessionData().getToken());
diff --git a/frontend-js/src/test/js/ServerConnector-test.js b/frontend-js/src/test/js/ServerConnector-test.js
index 3a476c3233001d645f573ca1e7fb858777d6f666..039de8876b17aee44d826adeda1dbada2b59b467 100644
--- a/frontend-js/src/test/js/ServerConnector-test.js
+++ b/frontend-js/src/test/js/ServerConnector-test.js
@@ -229,9 +229,14 @@ describe('ServerConnector', function () {
 
   it('getToken', function () {
     ServerConnector.getSessionData(null).setToken(undefined);
-
+    var originalFun = ServerConnector.login;
+    ServerConnector.login = function () {
+      return Promise.resolve("TOKEN");
+    };
     return ServerConnector.getToken().then(function (token) {
       assert.ok(token !== undefined);
+    }).finally(function () {
+      ServerConnector.login = originalFun;
     });
   });
 
@@ -326,16 +331,6 @@ describe('ServerConnector', function () {
     });
   });
 
-  describe('readFile', function () {
-    it('check session expired', function () {
-      ServerConnector.getSessionData().setToken(undefined);
-      assert.ok(ServerConnector.getSessionData().getLogin());
-      return ServerConnector.sendGetRequest("package.json", "Downloading projects").then(function () {
-        assert.notOk(ServerConnector.getSessionData().getLogin());
-      });
-    });
-  });
-
   describe('getUsers', function () {
     it('default', function () {
       return ServerConnector.getUsers().then(function (users) {
diff --git a/frontend-js/testFiles/apiCalls/doLogin/POST_login=anonymous& b/frontend-js/testFiles/apiCalls/doLogin/POST_login=anonymous&token=MOCK_TOKEN_ID&
similarity index 100%
rename from frontend-js/testFiles/apiCalls/doLogin/POST_login=anonymous&
rename to frontend-js/testFiles/apiCalls/doLogin/POST_login=anonymous&token=MOCK_TOKEN_ID&