Add fallback options for auto-codes [story:43811539]