Added map to AddUser.
Merge remote-tracking branch 'origin/master'
Added map to AddUser.