To accommodate the upcoming schema change to auth object...
Merge pull request #673 from kaysoky/AuthSchemaChange

Accommodate auth schema changes