Bug 1091261 - Implement login 3.0
Merge pull request #2357 from jbuck/login3.1

Bug 1091261 - Implement login 3.0