Remove password fields if needed.

fixes #440