Fix some issue in login page refactor