Remove redundant code and check for dpd_enable checkbox to be set
Oops wrong choice the checkbox is only for javascript
Commit the other part of the fix for Ticket #3955