diff --git a/.gitignore b/.gitignore
index de762cac9c8..c2373ed19e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,5 +86,6 @@ packages/grid/helm/examples/dev/migration.yaml
 # dynaconf settings file
 **/settings.yaml
 
-
+# Any temporary material created for scenarios
 notebooks/scenarios/bigquery/*.json
+notebooks/scenarios/bigquery/sync/*.json
diff --git a/notebooks/scenarios/bigquery/sync/01-setup-high-low-datasites.ipynb b/notebooks/scenarios/bigquery/sync/010-setup-high-low-datasites.ipynb
similarity index 94%
rename from notebooks/scenarios/bigquery/sync/01-setup-high-low-datasites.ipynb
rename to notebooks/scenarios/bigquery/sync/010-setup-high-low-datasites.ipynb
index 633a73c38e4..9d9cf4dbb1a 100644
--- a/notebooks/scenarios/bigquery/sync/01-setup-high-low-datasites.ipynb
+++ b/notebooks/scenarios/bigquery/sync/010-setup-high-low-datasites.ipynb
@@ -48,6 +48,7 @@
     "from syft import test_helpers  # noqa: F401\n",
     "from syft import test_settings\n",
     "\n",
+    "from email_helpers import get_email_server\n",
     "from worker_helpers import build_and_launch_worker_pool_from_docker_str\n",
     "from worker_helpers import launch_worker_pool_from_docker_tag_and_registry\n",
     "# isort: on"
@@ -88,12 +89,10 @@
    ]
   },
   {
-   "cell_type": "code",
-   "execution_count": null,
+   "cell_type": "markdown",
    "metadata": {},
-   "outputs": [],
    "source": [
-    "# start email server here"
+    "### Email Server"
    ]
   },
   {
@@ -102,7 +101,10 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "low_client = server_low.login(email=\"info@openmined.org\", password=\"changethis\")"
+    "email_server_low, smtp_server_low = get_email_server(reset=True, server_side_type=\"low\")\n",
+    "email_server_high, smtp_server_high = get_email_server(\n",
+    "    reset=True, server_side_type=\"high\"\n",
+    ")"
    ]
   },
   {
@@ -111,6 +113,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "low_client = server_low.login(email=\"info@openmined.org\", password=\"changethis\")\n",
     "high_client = server_high.login(email=\"info@openmined.org\", password=\"changethis\")"
    ]
   },
@@ -298,16 +301,9 @@
    "source": [
     "if environment != \"remote\":\n",
     "    server_high.land()\n",
-    "    server_low.land()"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# TODO close email client"
+    "    server_low.land()\n",
+    "smtp_server_low.stop()\n",
+    "smtp_server_high.stop()"
    ]
   }
  ],
diff --git a/notebooks/scenarios/bigquery/sync/011-users-emails-passwords.ipynb b/notebooks/scenarios/bigquery/sync/011-users-emails-passwords.ipynb
new file mode 100644
index 00000000000..fc52c3ba391
--- /dev/null
+++ b/notebooks/scenarios/bigquery/sync/011-users-emails-passwords.ipynb
@@ -0,0 +1,669 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "0",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# import os\n",
+    "\n",
+    "# os.environ[\"ORCHESTRA_DEPLOYMENT_TYPE\"] = \"remote\"\n",
+    "# os.environ[\"DEV_MODE\"] = \"True\"\n",
+    "# os.environ[\"TEST_EXTERNAL_REGISTRY\"] = \"k3d-registry.localhost:5800\"\n",
+    "# os.environ[\"CLUSTER_HTTP_PORT_HIGH\"] = \"9081\"\n",
+    "# os.environ[\"CLUSTER_HTTP_PORT_LOW\"] = \"9083\""
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "1",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# isort: off\n",
+    "# stdlib\n",
+    "import os\n",
+    "\n",
+    "# syft absolute\n",
+    "import syft as sy\n",
+    "from syft import test_helpers  # noqa: F401\n",
+    "\n",
+    "# third party\n",
+    "from email_helpers import SENDER\n",
+    "from email_helpers import create_user\n",
+    "from email_helpers import get_email_server\n",
+    "from email_helpers import make_user\n",
+    "from email_helpers import save_users\n",
+    "# isort: on"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "2",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "environment = os.environ.get(\"ORCHESTRA_DEPLOYMENT_TYPE\", \"python\")\n",
+    "high_port = os.environ.get(\"CLUSTER_HTTP_PORT_HIGH\", \"auto\")\n",
+    "low_port = os.environ.get(\"CLUSTER_HTTP_PORT_LOW\", \"auto\")\n",
+    "print(environment, high_port, low_port)"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "3",
+   "metadata": {},
+   "source": [
+    "# Launch server & login"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "4",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "server_low = sy.orchestra.launch(\n",
+    "    name=\"bigquery-low\",\n",
+    "    server_side_type=\"low\",\n",
+    "    dev_mode=True,\n",
+    "    n_consumers=1,\n",
+    "    create_producer=True,\n",
+    "    port=low_port,\n",
+    ")\n",
+    "\n",
+    "server_high = sy.orchestra.launch(\n",
+    "    name=\"bigquery-high\",\n",
+    "    server_side_type=\"high\",\n",
+    "    dev_mode=True,\n",
+    "    n_consumers=1,\n",
+    "    create_producer=True,\n",
+    "    port=high_port,\n",
+    ")"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "5",
+   "metadata": {},
+   "source": [
+    "### Email Server"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "6",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "email_server_low, smtp_server_low = get_email_server(server_side_type=\"low\")\n",
+    "email_server_high, smtp_server_high = get_email_server(server_side_type=\"high\")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "7",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "low_client = server_low.login(email=\"info@openmined.org\", password=\"changethis\")\n",
+    "high_client = server_high.login(email=\"info@openmined.org\", password=\"changethis\")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "8",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "low_client.users"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "9",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "low_client.api.services.settings.enable_notifications(\n",
+    "    email_sender=SENDER,\n",
+    "    email_server=\"localhost\",\n",
+    "    email_port=\"9025\",\n",
+    ")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "10",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "high_client.api.services.settings.enable_notifications(\n",
+    "    email_sender=SENDER,\n",
+    "    email_server=\"localhost\",\n",
+    "    email_port=\"9026\",\n",
+    ")"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "11",
+   "metadata": {},
+   "source": [
+    "# Register users"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "12",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "num_users = int(os.environ.get(\"NUM_TEST_USERS\", 5))\n",
+    "print(f\"registering {num_users} users\")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "13",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "users = []\n",
+    "email_disable_index = 0\n",
+    "reset_password_index = 1\n",
+    "for i in range(num_users):\n",
+    "    user = make_user()\n",
+    "    user._email_server = email_server_low\n",
+    "    create_user(low_client, user)\n",
+    "    user.client = low_client\n",
+    "    if email_disable_index == i:\n",
+    "        user.email_disabled = True\n",
+    "    if reset_password_index == i:\n",
+    "        user.reset_password = True\n",
+    "    users.append(user)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "14",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "save_users(users)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "15",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# stdlib\n",
+    "import asyncio\n",
+    "\n",
+    "await asyncio.sleep(5)"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "16",
+   "metadata": {},
+   "source": [
+    "## Verify Emails are sent"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "17",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# everyone gets a welcome email\n",
+    "server_name = low_client.name\n",
+    "for user in users:\n",
+    "    emails = user.emails\n",
+    "    assert len(emails) == 1\n",
+    "    welcome_email = user.emails[0]\n",
+    "    assert welcome_email.email_from == SENDER\n",
+    "    assert len(welcome_email.email_to) == 1\n",
+    "    assert welcome_email.email_to[0] == user.email\n",
+    "    assert f\"Welcome to {server_name}\" in welcome_email.email_content"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "18",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# one user disables notifications\n",
+    "# one user requests a password reset\n",
+    "no_email_user = None\n",
+    "reset_password_user = None\n",
+    "for user in users:\n",
+    "    user.client = low_client  # get user client\n",
+    "    if user.email_disabled:\n",
+    "        no_email_user = user\n",
+    "        # disable for this user only\n",
+    "        user.client.api.notifications.deactivate()\n",
+    "\n",
+    "    if user.reset_password:\n",
+    "        # ask admin for forgot password flow\n",
+    "        user.client.guest().forgot_password(email=user.email)\n",
+    "        assert \"Password Reset Requested\" in user.emails[1].email_content\n",
+    "        reset_password_user = user"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "19",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "ds0 = users[0]"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "20",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "ds0_user = ds0.client.account\n",
+    "ds0_user"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "21",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# with sy.raises(\n",
+    "# sy.SyftException(public_message=\"*tried to update user*\"\n",
+    "# ), show=True): this is different on k8s no idea why\n",
+    "with sy.raises(sy.SyftException, show=True):\n",
+    "    ds0.client.users.update(uid=ds0_user.id, role=\"admin\")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "22",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# with sy.raises(sy.SyftException(public_message=\"*tried to update user*\"), show=True):\n",
+    "with sy.raises(sy.SyftException, show=True):\n",
+    "    ds0_user.update(role=\"admin\")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "23",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# TODO: test disabling and re-enabling all notifications"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "24",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# low_client.api.services.settings.disable_notifications()\n",
+    "# low_client.api.services.settings.enable_notifications()"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "25",
+   "metadata": {},
+   "source": [
+    "## Test reset password"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "26",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# This is necessary as it sets the new token value in user.reset_token\n",
+    "token = reset_password_user.get_token()\n",
+    "token"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "27",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# This is necessary as it sets the new password value in user.new_password\n",
+    "passw = reset_password_user.make_new_password()\n",
+    "passw"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "28",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "assert token\n",
+    "assert passw"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "29",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "output = reset_password_user.client.guest().reset_password(\n",
+    "    token=reset_password_user.reset_token, new_password=reset_password_user.new_password\n",
+    ")\n",
+    "output"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "30",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "assert isinstance(output, sy.SyftSuccess)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "31",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# relogin\n",
+    "reset_password_user.relogin()\n",
+    "# reset_password_user.client = reset_password_user.client"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "32",
+   "metadata": {},
+   "source": [
+    "## Reset password second time"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "33",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "reset_password_user.client.guest().forgot_password(email=reset_password_user.email)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "34",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "output = reset_password_user.client.guest().reset_password(\n",
+    "    token=reset_password_user.get_token(),\n",
+    "    new_password=reset_password_user.make_new_password(),\n",
+    ")\n",
+    "output"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "35",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "assert isinstance(output, sy.SyftSuccess)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "36",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# print(f\"token:\\t\\t {reset_password_user.reset_token}\\n\\\n",
+    "# password:\\t {reset_password_user.password}\\n\\\n",
+    "# new password:\\t {reset_password_user.new_password}\")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "37",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "reset_password_user.update_password()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "38",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# print(f\"token:\\t\\t {reset_password_user.reset_token}\\n\\\n",
+    "# password:\\t {reset_password_user.password}\\n\\\n",
+    "# new password:\\t {reset_password_user.new_password}\")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "39",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# relogin\n",
+    "reset_password_user.relogin()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "40",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "save_users(users)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "41",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "reset_password_user"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "42",
+   "metadata": {},
+   "source": [
+    "## Reduce token expiration and try resetting"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "43",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Variable is poorly named, token expiration time is in seconds and not minutes\n",
+    "low_client.api.services.settings.update(pwd_token_config={\"token_exp_min\": 3})\n",
+    "low_client.refresh()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "44",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "reset_password_user.client.guest().forgot_password(email=reset_password_user.email)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "45",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Wait 3 seconds to ensure token expires\n",
+    "await asyncio.sleep(3)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "46",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# This should throw a SyftError because we waited too long\n",
+    "output = reset_password_user.client.guest().reset_password(\n",
+    "    token=reset_password_user.get_token(),\n",
+    "    new_password=reset_password_user.make_new_password(),\n",
+    ")\n",
+    "output"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "47",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "assert isinstance(output, sy.SyftError)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "48",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# relogin\n",
+    "with sy.raises(sy.SyftException, show=True):\n",
+    "    reset_password_user.relogin()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "49",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Set things back to the the default settings\n",
+    "low_client.api.services.settings.update(pwd_token_config={\"token_exp_min\": 1800})\n",
+    "low_client.refresh()"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "50",
+   "metadata": {},
+   "source": [
+    "# Cleanup"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "51",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "if environment != \"remote\":\n",
+    "    server_high.land()\n",
+    "    server_low.land()\n",
+    "smtp_server_low.stop()\n",
+    "smtp_server_high.stop()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "52",
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3 (ipykernel)",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.12.3"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}
diff --git a/notebooks/scenarios/bigquery/sync/02-configure-api-and-sync.ipynb b/notebooks/scenarios/bigquery/sync/020-configure-api-and-sync.ipynb
similarity index 88%
rename from notebooks/scenarios/bigquery/sync/02-configure-api-and-sync.ipynb
rename to notebooks/scenarios/bigquery/sync/020-configure-api-and-sync.ipynb
index 094841ef58e..f97bad104e8 100644
--- a/notebooks/scenarios/bigquery/sync/02-configure-api-and-sync.ipynb
+++ b/notebooks/scenarios/bigquery/sync/020-configure-api-and-sync.ipynb
@@ -49,10 +49,11 @@
     "# import os\n",
     "# os.environ[\"TEST_BIGQUERY_APIS_LIVE\"] = \"True\"\n",
     "# third party\n",
+    "import pandas as pd\n",
     "from apis import make_schema\n",
     "from apis import make_submit_query\n",
     "from apis import make_test_query\n",
-    "import pandas as pd\n",
+    "from email_helpers import get_email_server\n",
     "# isort: on"
    ]
   },
@@ -88,6 +89,23 @@
     ")"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "### Email Server"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "email_server_low, smtp_server_low = get_email_server(server_side_type=\"low\")\n",
+    "email_server_high, smtp_server_high = get_email_server(server_side_type=\"high\")"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -458,16 +476,11 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "res = job.wait().get()"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "assert isinstance(res, pd.DataFrame)"
+    "# Not sure if we can run jobs on the high side directly\n",
+    "res = job.wait()\n",
+    "# res = job.wait().get()\n",
+    "# assert len(res) == 2\n",
+    "# assert isinstance(res, pd.DataFrame)"
    ]
   },
   {
@@ -582,6 +595,58 @@
     "assert len(high_client.custom_api.api_endpoints()) == 3"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# Test emails"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# email_server_low.get_emails_for_user(user_email=\"info@openmined.org\")\n",
+    "assert len(email_server_high.get_emails_for_user(user_email=\"info@openmined.org\")) == 2"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "assert (\n",
+    "    \"Job Failed\"\n",
+    "    in email_server_high.get_emails_for_user(user_email=\"info@openmined.org\")[\n",
+    "        0\n",
+    "    ].email_content\n",
+    ")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "assert (\n",
+    "    \"A new request has been submitted and requires your attention\"\n",
+    "    in email_server_high.get_emails_for_user(user_email=\"info@openmined.org\")[\n",
+    "        1\n",
+    "    ].email_content\n",
+    ")"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# Clean up"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -590,7 +655,9 @@
    "source": [
     "if environment != \"remote\":\n",
     "    server_high.land()\n",
-    "    server_low.land()"
+    "    server_low.land()\n",
+    "smtp_server_low.stop()\n",
+    "smtp_server_high.stop()"
    ]
   },
   {
diff --git a/notebooks/scenarios/bigquery/sync/03-ds-submit-request.ipynb b/notebooks/scenarios/bigquery/sync/030-ds-submit-request.ipynb
similarity index 82%
rename from notebooks/scenarios/bigquery/sync/03-ds-submit-request.ipynb
rename to notebooks/scenarios/bigquery/sync/030-ds-submit-request.ipynb
index a2759038134..cdcc6645009 100644
--- a/notebooks/scenarios/bigquery/sync/03-ds-submit-request.ipynb
+++ b/notebooks/scenarios/bigquery/sync/030-ds-submit-request.ipynb
@@ -34,12 +34,16 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# third party\n",
-    "import pandas as pd\n",
-    "\n",
+    "# isort: off\n",
     "# syft absolute\n",
     "import syft as sy\n",
-    "from syft import test_settings"
+    "from syft import test_settings\n",
+    "from syft import test_helpers  # noqa: F401\n",
+    "\n",
+    "# third party\n",
+    "import pandas as pd\n",
+    "from email_helpers import get_email_server\n",
+    "# isort: on"
    ]
   },
   {
@@ -65,6 +69,15 @@
     ")"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "email_server_low, smtp_server_low = get_email_server(server_side_type=\"low\")"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -273,7 +286,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "# Shutdown"
+    "# Test emails"
    ]
   },
   {
@@ -282,7 +295,45 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# todo: add email server shutdown"
+    "assert len(email_server_low.get_emails_for_user(user_email=\"info@openmined.org\")) == 1\n",
+    "assert (\n",
+    "    len(email_server_low.get_emails_for_user(user_email=ds_client.account.email)) == 1\n",
+    ")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "assert (\n",
+    "    \"A new request has been submitted and requires your attention\"\n",
+    "    in email_server_low.get_emails_for_user(user_email=\"info@openmined.org\")[\n",
+    "        0\n",
+    "    ].email_content\n",
+    ")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "assert (\n",
+    "    \"We regret to inform you that your function job\"\n",
+    "    in email_server_low.get_emails_for_user(user_email=ds_client.account.email)[\n",
+    "        0\n",
+    "    ].email_content\n",
+    ")"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# Shutdown"
    ]
   },
   {
@@ -292,7 +343,8 @@
    "outputs": [],
    "source": [
     "if environment != \"remote\":\n",
-    "    server_low.land()"
+    "    server_low.land()\n",
+    "smtp_server_low.stop()"
    ]
   },
   {
diff --git a/notebooks/scenarios/bigquery/sync/04-do-review-requests.ipynb b/notebooks/scenarios/bigquery/sync/040-do-review-requests.ipynb
similarity index 81%
rename from notebooks/scenarios/bigquery/sync/04-do-review-requests.ipynb
rename to notebooks/scenarios/bigquery/sync/040-do-review-requests.ipynb
index 4eec3d6e7b1..0299c506afe 100644
--- a/notebooks/scenarios/bigquery/sync/04-do-review-requests.ipynb
+++ b/notebooks/scenarios/bigquery/sync/040-do-review-requests.ipynb
@@ -6,15 +6,18 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "# isort: off\n",
     "# stdlib\n",
     "import os\n",
     "\n",
-    "# third party\n",
-    "import pandas as pd\n",
-    "\n",
     "# syft absolute\n",
     "import syft as sy\n",
     "from syft.client.syncing import compare_clients\n",
+    "from syft import test_helpers  # noqa: F401\n",
+    "\n",
+    "# third party\n",
+    "from email_helpers import get_email_server\n",
+    "# isort: on\n",
     "\n",
     "# os.environ[\"ORCHESTRA_DEPLOYMENT_TYPE\"] = \"remote\"\n",
     "# os.environ[\"CLUSTER_HTTP_PORT_HIGH\"] = \"9081\"\n",
@@ -64,6 +67,16 @@
     ")"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "email_server_low, smtp_server_low = get_email_server(server_side_type=\"low\")\n",
+    "email_server_high, smtp_server_high = get_email_server(server_side_type=\"high\")"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -180,9 +193,11 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "res = job.wait().get()\n",
+    "# There is some issue with running jobs on high side directly\n",
+    "res = job.wait()\n",
     "\n",
-    "assert isinstance(res, pd.DataFrame)"
+    "# res = job.wait().get()\n",
+    "# assert isinstance(res, pd.DataFrame)"
    ]
   },
   {
@@ -265,6 +280,42 @@
     "assert \"approved\" in str(user_request.status).lower()"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# Test email"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Should this user be notified about approval? Right now it seems that it is not.\n",
+    "assert (\n",
+    "    len(email_server_low.get_emails_for_user(user_email=\"data_scientist@openmined.org\"))\n",
+    "    == 1\n",
+    ")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Similarly, after syncing, should the admin be notified about anything?"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# Shutdown"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -273,7 +324,9 @@
    "source": [
     "if environment != \"remote\":\n",
     "    server_high.land()\n",
-    "    server_low.land()"
+    "    server_low.land()\n",
+    "smtp_server_low.stop()\n",
+    "smtp_server_high.stop()"
    ]
   },
   {
diff --git a/notebooks/scenarios/bigquery/sync/05-ds-get-results.ipynb b/notebooks/scenarios/bigquery/sync/050-ds-get-results.ipynb
similarity index 87%
rename from notebooks/scenarios/bigquery/sync/05-ds-get-results.ipynb
rename to notebooks/scenarios/bigquery/sync/050-ds-get-results.ipynb
index 1e61e0d8587..7dec4c8835a 100644
--- a/notebooks/scenarios/bigquery/sync/05-ds-get-results.ipynb
+++ b/notebooks/scenarios/bigquery/sync/050-ds-get-results.ipynb
@@ -6,14 +6,18 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "# isort: off\n",
     "# stdlib\n",
     "import os\n",
     "\n",
-    "# third party\n",
-    "import pandas as pd\n",
-    "\n",
     "# syft absolute\n",
     "import syft as sy\n",
+    "from syft import test_helpers  # noqa: F401\n",
+    "\n",
+    "# third party\n",
+    "import pandas as pd\n",
+    "from email_helpers import get_email_server\n",
+    "# isort: on\n",
     "\n",
     "# os.environ[\"ORCHESTRA_DEPLOYMENT_TYPE\"] = \"remote\"\n",
     "# os.environ[\"CLUSTER_HTTP_PORT_LOW\"] = \"9083\""
@@ -53,6 +57,15 @@
     ")"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "email_server_low, smtp_server_low = get_email_server(server_side_type=\"low\")"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -114,7 +127,8 @@
    "outputs": [],
    "source": [
     "if environment != \"remote\":\n",
-    "    server_low.land()"
+    "    server_low.land()\n",
+    "smtp_server_low.stop()"
    ]
   },
   {
diff --git a/test_helpers/email_helpers.py b/test_helpers/email_helpers.py
index f58d41a20f8..eac45a69b09 100644
--- a/test_helpers/email_helpers.py
+++ b/test_helpers/email_helpers.py
@@ -218,8 +218,8 @@ def user_exists(root_client, email: str) -> bool:
 
 
 class SMTPTestServer:
-    def __init__(self, email_server):
-        self.port = 9025
+    def __init__(self, email_server, port=9025):
+        self.port = port
         self.hostname = "0.0.0.0"
         self._stop_event = asyncio.Event()
 
@@ -251,7 +251,7 @@ async def handle_DATA(self, server, session, envelope):
             print(f"> Error initializing SMTPTestServer Controller: {e}")
 
     def start(self):
-        print(f"> Starting SMTPTestServer on: {self.hostname}:{self.port}")
+        # print(f"> Starting SMTPTestServer on: {self.hostname}:{self.port}")
         asyncio.create_task(self.async_loop())
 
     async def async_loop(self):
@@ -314,11 +314,21 @@ def run_with_timeout(self, condition_func, *args, **kwargs):
         return result
 
 
-def get_email_server(reset=False):
-    email_server = EmailServer()
+def get_email_server(reset=False, server_side_type=""):
+    if server_side_type == "high":
+        email_file = "./emails_high.json"
+        port = 9026
+    elif server_side_type == "low":
+        email_file = "./emails_low.json"
+        port = 9025
+    else:
+        email_file = "./emails.json"
+        port = 9025
+
+    email_server = EmailServer(filepath=email_file)
     if reset:
         email_server.reset_emails()
-    smtp_server = SMTPTestServer(email_server)
+    smtp_server = SMTPTestServer(email_server, port=port)
     smtp_server.start()
     return email_server, smtp_server