Fix issue when logged in