fix bugs around User