Finish the refactor of the PopUser module