bugfix for end_user setting