Changes for sign in and user session