Applied changes for email mixups 9/23