Updated handling for users who are signed in