diff --git a/mx-tester.yml b/mx-tester.yml
index 94facba..79feba9 100644
--- a/mx-tester.yml
+++ b/mx-tester.yml
@@ -2,11 +2,11 @@ name: mjolnir
 
 up:
   before:
-    - docker run --rm --network $MX_TEST_NETWORK_NAME --name mjolnir-test-postgres --domainname mjolnir-test-postgres -e POSTGRES_PASSWORD=mjolnir-test -e POSTGRES_USER=mjolnir-tester -e POSTGRES_DB=mjolnir-test-db -d -p 127.0.0.1:8082:5432 postgres
+    - docker run --rm --network $MX_TEST_NETWORK_NAME --name mjolnir-test-postgres --domainname mjolnir-test-postgres -e POSTGRES_PASSWORD=mjolnir-test -e POSTGRES_USER=mjolnir-tester -e POSTGRES_DB=mjolnir-test-db -d -p 127.0.0.1:8083:5432 postgres
     # Wait until postgresql is ready
-    - until psql postgres://mjolnir-tester:mjolnir-test@localhost:8082/mjolnir-test-db -c ""; do echo "Waiting for psql..."; sleep 1s; done
+    - until psql postgres://mjolnir-tester:mjolnir-test@localhost:8083/mjolnir-test-db -c ""; do echo "Waiting for psql..."; sleep 1s; done
     # Make table in postgres
-    - psql postgres://mjolnir-tester:mjolnir-test@localhost:8082/mjolnir-test-db -c "CREATE TABLE mjolnir (local_part VARCHAR(255), owner VARCHAR(255), management_room TEXT)"
+    - psql postgres://mjolnir-tester:mjolnir-test@localhost:8083/mjolnir-test-db -c "CREATE TABLE mjolnir (local_part VARCHAR(255), owner VARCHAR(255), management_room TEXT)"
     # Launch the reverse proxy, listening for connections *only* on the local host.
     - docker run --rm --network host --name mjolnir-test-reverse-proxy -p 127.0.0.1:8081:80 -v $MX_TEST_CWD/test/nginx.conf:/etc/nginx/nginx.conf:ro -d nginx
     - yarn install
diff --git a/src/appservice/AppService.ts b/src/appservice/AppService.ts
index 0192b33..e9d4e7c 100644
--- a/src/appservice/AppService.ts
+++ b/src/appservice/AppService.ts
@@ -99,7 +99,7 @@ export class MjolnirAppService {
         reg.setId(AppServiceRegistration.generateToken());
         reg.setHomeserverToken(AppServiceRegistration.generateToken());
         reg.setAppServiceToken(AppServiceRegistration.generateToken());
-        reg.setSenderLocalpart("mjolnir");
+        reg.setSenderLocalpart("mjolnir-bot");
         reg.addRegexPattern("users", "@mjolnir_.*", true);
         reg.setRateLimited(false);
         callback(reg);
diff --git a/src/appservice/config/config.harness.yaml b/src/appservice/config/config.harness.yaml
index e552a69..daa9338 100644
--- a/src/appservice/config/config.harness.yaml
+++ b/src/appservice/config/config.harness.yaml
@@ -5,7 +5,7 @@ homeserver:
 
 db:
   engine: "postgres"
-  connectionString: "postgres://mjolnir-tester:mjolnir-test@localhost:8082/mjolnir-test-db"
+  connectionString: "postgres://mjolnir-tester:mjolnir-test@localhost:8083/mjolnir-test-db"
 
 accessControlList: "#access-control-list:localhost:9999"