Move password loading into a function.
Replace unnecessary BLOCK with EXPR.
Match password field(s) more precisely.
Map only password fields that have values set.

Or something...