remove find_or_create_by method since it has been deprecated; also fixed an error when there is no buddy and email address