fix some login weirdness
Merge branch 'master' into scroll-card-list