Issue #142 - adding auth_source_id support (correct branch)