Fix problem with department and organization

Changing/adding a department was overwriting the organization property