Fix for #353.
Merge remote-tracking branch 'origin/#353' into #170-My-account-section-allows-to-save-insecure-password
#353, #170, #321