merge changes
Fixed 2 bugs with the Edit Account Form