Story 45754019: fixing name/email display