Fix for role assignment saving bug (needs more testing due to severity)