[2.2] fixed edit account page fields, closes #6577