Fix for the add / edit form