4th iteration - Fixed register users