Add more CAT II corrections

Not entirely happy with the lineinfile for V-38658. Might need to add a variable that specifies password options.