Add area to login and user info
Fix conflict in login