Changes to allow dde-activation of users