CLUB-550. Fix submit plan needs work