- Fix google authenticate
- Fix NPE