fix the bug of set the payto with contact name
Merge from origin master