Login options

Just adding some flow logic to the login process. All of these additions have merged just fine with master locally on my machine.