Addapted to new CustomUser model