Fixed authentication
Merge branch 'authentication'