fix bug that shows up on login. need to understand better, but this will solve the bug for now
Merge pull request #139 from MozillaFoundation/next-handling

fix bug that shows up on login. needs followup refactoring.