CM - 2

Changes for Customized Messaging - Part 2 (Authentication)