my insomnia kicked in.. more code towards a possible fix

This time uid struct is no longer for services users any more, we store
everyone in there. Ran a quick test and is was working here - needs to
be stress tested