Bug 15485: (QA followup) Fix behaviour and default values