Adding continued support for deactivated users.