Fixed #377. Added  that affects both create and edit forms