diff --git a/js/launcher.js b/js/launcher.js
index ffc59f3..525e85f 100755
--- a/js/launcher.js
+++ b/js/launcher.js
@@ -681,9 +681,10 @@ class LoginProgress {
 export function docker_logoff() {
   return logout().always((logoutresult) => {
     // always delete jwt_user_token
-    localStorage.removeItem('abcdesktop_jwt_user_token');
+    // odapi does the localStorage.removeItem('abcdesktop_jwt_user_token');
+    // 
     window.od.currentUser = null;
-    //window.Cookies.remove('abcdesktop_token', { path: '/API' });
+    window.Cookies.remove('abcdesktop_token', { path: '/API' });
     // remove loadbalancing cookie
     window.Cookies.remove('abcdesktop_host');
     // Do not reload the default page if manager and provider is defined
diff --git a/js/odapiclient.js b/js/odapiclient.js
index 1f67cda..224b039 100755
--- a/js/odapiclient.js
+++ b/js/odapiclient.js
@@ -37,7 +37,7 @@ const odApiClient = new (class ODApiClient {
 
       logout(data_dict) {
         return client.sendRequest('auth/logout', data_dict)
-          .then((res) => {
+          .always((res) => {
             localStorage.removeItem('abcdesktop_jwt_user_token');
             return res;
           });