Add logout, fix login action