Finished Edit, added Encode

Caused error with Users page, need to fix.