Adding the ability to select account type in UI