fix findByEmail searching for deactivated users

OK. I think understand this now. Your filter includes the original plus an `or` of the new filter which looks at `uid`, where deactivated accounts are stored.