[OEM-168] Fix divert email check + PSR2 changes