fix security client order, feedback