Christina/fix default settings

STUD-2056

@benmcmorran and @auraz please review
Right..