Fix first-account validation and retry issues