Added code to avoid logging passwords or challenge.