Fix services user management and use new UUID dict as well