login weirdness and db users
Merge branch 'brian_back'