diff --git a/scripts/core/osm2ogrscript b/scripts/core/osm2ogrscript
index aab2ea61cf..08ef9ef6d7 100644
--- a/scripts/core/osm2ogrscript
+++ b/scripts/core/osm2ogrscript
@@ -5,7 +5,7 @@
 # Options for most exports
 HOOT_OPTS+= -D convert.ops=hoot::DecomposeBuildingRelationsVisitor
 HOOT_OPTS+= -D hootapi.db.writer.overwrite.map=true -D hootapi.db.writer.create.user=true
-HOOT_OPTS+= -D api.db.email=test@test.com
+HOOT_OPTS+= -D api.db.email=${TEST_EMAIL}
 
 # Add the option to append
 ifeq "$(append)" "true"
@@ -14,7 +14,7 @@ endif
 
 
 # Options for osm & osm.pbf export
-OSM_OPTS=-D hootapi.db.writer.create.user=true -D api.db.email=test@test.com
+OSM_OPTS=-D hootapi.db.writer.create.user=true -D api.db.email=${TEST_EMAIL}
 
 # Add the option to have status tags as text with "Input1" instead of "1" or "Unknown1"
 ifeq "$(textstatus)" "true"
diff --git a/test-files/cmd/glacial/ServiceExportOsm.sh b/test-files/cmd/glacial/ServiceExportOsm.sh
index dcec5b809d..255002cded 100755
--- a/test-files/cmd/glacial/ServiceExportOsm.sh
+++ b/test-files/cmd/glacial/ServiceExportOsm.sh
@@ -11,7 +11,8 @@ export outputfolder=$HOOT_HOME/tmp/$outputname
 export inputfile=DcGisRoads
 export input=$inputfile_$outputname
 export inputtype=db
-export HOOT_OPTS="-C Testing.conf -D hootapi.db.writer.create.user=true -D hootapi.db.writer.overwrite.map=true -D api.db.email=test@test.com -D writer.include.debug.tags=true --warn"
+export TEST_EMAIL="ServiceExportOsmTest@hootenanny.com"
+export HOOT_OPTS="-C Testing.conf -D hootapi.db.writer.create.user=true -D hootapi.db.writer.overwrite.map=true -D api.db.email=${TEST_EMAIL} -D writer.include.debug.tags=true --warn"
 
 echo "Ingest the data"
 hoot convert $HOOT_OPTS test-files/$inputfile.osm $DB_URL/$input
@@ -41,4 +42,4 @@ hoot db-delete $HOOT_OPTS $DB_URL/$input
 rm -rf $outputfolder
 
 # Delete the user
-PGPASSWORD=$DB_PASSWORD psql $PSQL_DB_AUTH -d $DB_NAME  -c "DELETE FROM users WHERE email='test@test.com';" > /dev/null
+PGPASSWORD=$DB_PASSWORD psql $PSQL_DB_AUTH -d $DB_NAME  -c "DELETE FROM users WHERE email='${TEST_EMAIL}';" > /dev/null
diff --git a/translations/tds61.js b/translations/tds61.js
index 2d40b2de47..e64f6b7cc1 100644
--- a/translations/tds61.js
+++ b/translations/tds61.js
@@ -542,7 +542,7 @@ tds61 = {
       translate.txtToOgr(newFeatures[i]['attrs'], newFeatures[i]['tags'], tds61.rules.txtBiased,transMap);
 
       // one 2 one - we call the version that knows about OTH fields
-      translate.applyOgrOne2One(newFeatures[i]['tags'], newFeatures[i]['attrs'], tds61.lookup, tds61.fcodeLookup,transMap);
+      translate.applyTdsOne2One(newFeatures[i]['tags'], newFeatures[i]['attrs'], tds61.lookup, tds61.fcodeLookup,transMap);
 
       // post processing
       tds61.applyToOgrPostProcessing(newFeatures[i]['tags'], newFeatures[i]['attrs'], geometryType, {});