Fixed up some issues with role saving with account ids.