Update common view for create or update user
Merge branch 'esbb48' into wip