This CF was renamed during the 2.4->2.6 update

Load the correct CF so we can set it to Email if nothing was set.
Reported by Michal Wodzinski
(cherry picked from commit 0ba865f978fe105082bba1deeef732fa21b2d98b)