solved the userId bug
Merge remote-tracking branch 'origin/Smaranda'