Fixed account selection fails