Fixing gaps in login/logout