Updated user login/logout and user controller