6013
allowing only one user type to be selected
Merge branch 'master' into pinauthintegration