don't send when password is supplied, RT#34705