User

More changes in User Module

See diff & comments