[BugFix] Fix #606: Unexpected behaviour of edit form
Merge pull request #616 from Wahib/bug-fix-606

[BugFix] Fix #606: Unexpected behaviour of edit form