Refactoring of user forms
Fixed generation of user ids
Fixes