UAR-418 -- Changing spring config to correct misplacement of 'uaid' and 'uid'.