- fix company & user model
- fix company editing template