Account script cleanups

Added some more escaping to be a little safer.