Optimized the way we add users to avoid adding them twice when there is no need