diff --git a/rowers/integrations/nk.py b/rowers/integrations/nk.py
index e6694482..ce4d8b90 100644
--- a/rowers/integrations/nk.py
+++ b/rowers/integrations/nk.py
@@ -71,7 +71,7 @@ class NKIntegration(SyncIntegration):
         try:
             _ = self.open()
         except NoTokenError:  # pragma: no cover
-            dologging("nklog.log","NK Token error for user {id}".format(id=rower.user.id))
+            dologging("nklog.log","NK Token error for user {id}".format(id=self.rower.user.id))
             return 0
 
         workouts = self.get_workout_list(before=before, after=after)
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 1d07dcef..06f31d62 100644
Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ
diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py
index c079cfb7..00653b67 100644
--- a/rowsandall_app/settings.py
+++ b/rowsandall_app/settings.py
@@ -85,6 +85,7 @@ INSTALLED_APPS = [
     'taggit',
     'boatmovers',
     'django_recaptcha',
+    'anymail',
 ]
 
 AUTHENTICATION_BACKENDS = (
@@ -446,22 +447,28 @@ CACHE_MIDDLEWARE_SECONDS = 900
 # EMAIL_USE_TLS = CFG['email_use_tls']
 # DEFAULT_FROM_EMAIL = 'admin@rowsandall.com'
 
-EMAIL_BACKEND = 'django_ses.SESBackend'
+#EMAIL_BACKEND = 'django_ses.SESBackend'
 
-AWS_SES_REGION_NAME = CFG['aws_region']
-AWS_SES_REGION_ENDPOINT = CFG['aws_smtp']
+ANYMAIL = {
+    'MAILERSEND_API_TOKEN': CFG['mailersend_api_key'],
+    }
+EMAIL_BACKEND = 'anymail.backends.mailersend.EmailBackend'
 
-AWS_SES_ACCESS_KEY_ID = CFG['aws_access_key_id']
-AWS_SES_SECRET_ACCESS_KEY = CFG['aws_secret_access_key']
-AWS_ACCESS_KEY_ID = CFG['aws_access_key_id']
-AWS_SECRET_ACCESS_KEY = CFG['aws_secret_access_key']
+#AWS_SES_REGION_NAME = CFG['aws_region']
+#AWS_SES_REGION_ENDPOINT = CFG['aws_smtp']
 
-EMAIL_HOST = CFG['aws_smtp']
-EMAIL_PORT = CFG['aws_port']
-EMAIL_HOST_USER = CFG['aws_smtp_username']
-EMAIL_HOST_PASSWORD = CFG['aws_smtp_password']
-EMAIL_USE_TLS = CFG['email_use_tls']
+#AWS_SES_ACCESS_KEY_ID = CFG['aws_access_key_id']
+#AWS_SES_SECRET_ACCESS_KEY = CFG['aws_secret_access_key']
+#AWS_ACCESS_KEY_ID = CFG['aws_access_key_id']
+#AWS_SECRET_ACCESS_KEY = CFG['aws_secret_access_key']
+
+#EMAIL_HOST = CFG['aws_smtp']
+#EMAIL_PORT = CFG['aws_port']
+#EMAIL_HOST_USER = CFG['aws_smtp_username']
+#EMAIL_HOST_PASSWORD = CFG['aws_smtp_password']
+#EMAIL_USE_TLS = CFG['email_use_tls']
 DEFAULT_FROM_EMAIL = 'info@rowsandall.com'
+SERVER_EMAIL = 'support@rowsandall.com'
 
 
 # weather stuff
diff --git a/rowsandall_app/settings_dev.py b/rowsandall_app/settings_dev.py
index 1adb217b..53cf1694 100644
--- a/rowsandall_app/settings_dev.py
+++ b/rowsandall_app/settings_dev.py
@@ -105,16 +105,16 @@ SITE_URL = "http://localhost:8000"
 # EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend'
 # EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
 
-EMAIL_BACKEND = 'django_ses.SESBackend'
+#EMAIL_BACKEND = 'django_ses.SESBackend'
 
-AWS_SES_REGION_NAME = 'eu-west-1'
-AWS_SES_REGION_ENDPOINT = 'email.eu-west-1.amazonaws.com'
+#AWS_SES_REGION_NAME = 'eu-west-1'
+#AWS_SES_REGION_ENDPOINT = 'email.eu-west-1.amazonaws.com'
 
-EMAIL_HOST = CFG['aws_smtp']
-EMAIL_PORT = CFG['aws_port']
-EMAIL_HOST_USER = CFG['aws_smtp_username']
-EMAIL_HOST_PASSWORD = CFG['aws_smtp_password']
-EMAIL_USE_TLS = CFG['email_use_tls']
-DEFAULT_FROM_EMAIL = 'info@rowsandall.com'
+#EMAIL_HOST = CFG['aws_smtp']
+#EMAIL_PORT = CFG['aws_port']
+#EMAIL_HOST_USER = CFG['aws_smtp_username']
+#EMAIL_HOST_PASSWORD = CFG['aws_smtp_password']
+#EMAIL_USE_TLS = CFG['email_use_tls']
+#DEFAULT_FROM_EMAIL = 'info@rowsandall.com'
 
 SETTINGS_NAME = 'rowsandall_app.settings_dev'