Minor refactoring.
First steps towards functioning management of authentication settings.