Fixed bugs on create office