merged profile to users, fixed My Account