All the code changes so far need to be ported to the basic HTML fallback paths in case the accounts were set to use that rather than the default ui=2