Fixed return and logging of password-like props in clear text

Fixed return and logging of password-like props in clear text #2560