Updated to be consistemt with latest changes in spring social extensions.