Saving both new and edit forms now work correctly