fixed a bug when logging in using secondChanceLogin
Merge branch 'master' of github.com:punkave/apostrophe