Adding better support for deactivating account