Some authorization updates.
Merge branch 'master' of https://github.com/patr7/conf-reg-sys