Changed Account Management to allow choosing User Type
Merge branch 'AccountManagementFix' into development