Add forgot password link
Fix view conflict