Updated active deactivate account method with  update logic
Merge remote-tracking branch 'origin/dev' into dev