commits from my mastah branch


This a pull request for Mike S. to make login activity changes.