Move flag from Master header to User header