Only fall back to the default option if there is no POST data (see #6899)