Fixes user
Fixes usertype UI issue
Merge branch 'userFix'