Use the sdecode routine
Only run if it is a string, change in develop for six compat
Merge pull request #18377 from thatch45/usr_fix

Use the sdecode routine