Encoding added for XML so that <, >, & can be valid password characters
Some fixes...