all the problems with user data fixed
Merge pull request #1149 from diegosarmentero/master

all the problems with user data fixed