Fix for issue #230.

It's not really pretty, but it does bring the Authentication services back to life.