login first
Merge pull request #1 from yaring/feature/new-login

login first