correctly handles re-login
Merge pull request #30 from nastysloper/controllers

correctly handles re-login