Ok, fixed it so user is now just the returned shop value.
Fix up the user object we're returning