Add the option to always present the user with choosing pickup branch