fix edit user and assets validation
Merge remote-tracking branch 'alex/develop' into develop

* alex/develop:
  fix edit user and assets validation