Revert "fixed problems for user in populate_demo_data"

This reverts commit c33f04afae6d7e7b91617ca4be2930cc4b85d7b6.