Improve the default passenger settings