Fix. Errors first auth. issue874
Merge branch 'issue874'