Some modifications about new UserAccount concept