User Module bug fixes