Fix user logged in issues