Minor changes in User Module

Fixes and cleanups

See diff & comments