Fixing configuration for production authentication. More changes should be added after merge with master.