Fix for bug 3489

This fixes the problems reported in bug 3489, i.e. it give the account the name that the user has chosen for it. And it also removes the enumeration of account names, since one user is only allowed to have one account of each account type.