Set user org based on new organisation field. Ensures backware compatibility