Minor changes in User Module

See diff