Issue #142 - adding auth_source_id support (correct branch)

I see the squashed commits brought the original problem back. the formatting is broken.