User registration enhancement #1878