tidy up validation of savings accounts.
Merge remote-tracking branch 'upstream/develop'