diff --git a/frontend-js/src/main/js/ServerConnector.js b/frontend-js/src/main/js/ServerConnector.js
index 72985ccbd041c6b4552d7e0d220d5573f53e644f..33b048b91c970b2130ba46b703d3970daf9165d8 100644
--- a/frontend-js/src/main/js/ServerConnector.js
+++ b/frontend-js/src/main/js/ServerConnector.js
@@ -1220,7 +1220,8 @@ ServerConnector.getLoggedUser = function () {
   if (self._loggedUser !== undefined && self._loggedUser !== null) {
     return Promise.resolve(self._loggedUser);
   } else {
-    return self.getUser(self.getSessionData().getLogin()).then(function (user) {
+    //this prevents double calls
+    self._loggedUser = self.getUser(self.getSessionData().getLogin()).then(function (user) {
       if (user !== null) {
         self._loggedUser = user;
         return self._loggedUser;
@@ -1228,6 +1229,7 @@ ServerConnector.getLoggedUser = function () {
         return Promise.reject(new Error("User " + self.getSessionData().getLogin() + " doesn't exist"));
       }
     });
+    return self._loggedUser;
   }
 };