FIX BUG #60512 (the correct way this time)

Last fix just truncated the password. This fixes the message
handler per the bug report.