Fixing email bug

Now everything is branded with Con Name and Con Short Name.
Not sure why this changed.