Psql fixes and use email to resolve future orders