Only return useruid when it exists
Small refactors + use correct contact
more refactors