login errors fixed
Merge origin/master