fixing user deletion, missing cb
Merge branch 'master' into v0.4.x