logout and emailPassword

Change-Id: Ieb7bbf8d7547935cb62fc1e59bf1550fc80c8dfa