fixed login issues on dashboard
Merge branch 'master' into must_complete_all