Merge pull request #836 from antaflos/fix_auth_conf_owner