user admin, can use email and uname
Merge remote-tracking branch 'origin/master'