LPS-47399 Cannot add organizational roles to users 

Hi Preston,

I bumped into this issue while I was testing something else.

As you developed the fix for LPS-46900, could you please review my changes?

Let me know if I should send this pr to someone else.

Thanks,
Tamás