Integrate account update validation code from Porkodi
Merge remote-tracking branch 'origin/master'