Tweaked the id problem and user-Socialuser linkage, commenting enabled