login changes
Merge branch 'jrh1'