Fixed Company and Added Account Settings