Fixed a bug where role saving would fail if it was not the first role selected in that user session