Added current account selection