Little login/logout fixes