Fix user initiated de-registration
Merge pull request #67 from Metaswitch/user_init_dereg

[Reviewer Andy] Fix user initiated de-registration