Fixes #2926 Added missing fallbacks for user-info