Tidy up pass and resign badge logic