Fixing default template settings see #6111