Fix login/logout
Change text
Merge branch 'shao'