RT#29354: Password Security in Email [v3 merge]