change the capital letter
fix the bug for first login
merge