[13092375] Fix issue where adding a note to an account would cause a ser...

...ver error editing the account immediately after.

@CHenrie Please review.