pull Yaron 'login and logout fixed' commit