fix id to uid in User class once again