from p1620
ok and add username and useremail