Change Request 574: Additional functionality to support account selection