fixed account persistence/constant re-login bug
Merge branch 'master' into gh-pages