diff --git a/tests/api/test_lnurl_api.py b/tests/api/test_lnurl_api.py
index fbed55b3f..8e00811c3 100644
--- a/tests/api/test_lnurl_api.py
+++ b/tests/api/test_lnurl_api.py
@@ -47,7 +47,7 @@ TEST_BOLT11 = (
 async def test_wallet_lightning_address_lookup_and_callback(
     client, to_user, settings, mocker
 ):
-    settings.lnbits_enable_wallet_lightning_addresses = True
+    settings.lnbits_ln_address_mode = "core_first"
     wallet = await create_wallet(user_id=to_user.id, wallet_name="ln address")
     assert wallet.lightning_address
 
@@ -94,16 +94,16 @@ async def test_wallet_lightning_address_lookup_and_callback(
 
 @pytest.mark.anyio
 async def test_wallet_lightning_address_generation_settings(to_user, settings):
-    settings.lnbits_enable_wallet_lightning_addresses = True
+    settings.lnbits_ln_address_mode = "core_first"
     wallet = await create_wallet(user_id=to_user.id)
     assert wallet.lightning_address
     assert re.fullmatch(r"[a-z]+[a-z]+[0-9]", wallet.lightning_address)
 
-    settings.lnbits_enable_wallet_lightning_addresses = False
+    settings.lnbits_ln_address_mode = "extension_only"
     disabled_wallet = await create_wallet(user_id=to_user.id)
     assert disabled_wallet.lightning_address is None
 
-    settings.lnbits_enable_wallet_lightning_addresses = True
+    settings.lnbits_ln_address_mode = "core_first"
     backfilled = await get_wallet(disabled_wallet.id)
     assert backfilled
     assert backfilled.lightning_address
@@ -113,7 +113,7 @@ async def test_wallet_lightning_address_generation_settings(to_user, settings):
 async def test_wallet_lightning_address_callback_validates_comment(
     to_user, settings, mocker
 ):
-    settings.lnbits_enable_wallet_lightning_addresses = True
+    settings.lnbits_ln_address_mode = "core_first"
     wallet = await create_wallet(user_id=to_user.id)
     assert wallet.lightning_address
     request = mocker.Mock()
diff --git a/tests/api/test_user_api.py b/tests/api/test_user_api.py
index 67e4b7778..68eb10b02 100644
--- a/tests/api/test_user_api.py
+++ b/tests/api/test_user_api.py
@@ -96,7 +96,7 @@ async def test_user_api_superuser_sets_wallet_lightning_address(
     )
     wallet = user.wallets[0]
 
-    settings.lnbits_enable_wallet_lightning_addresses = True
+    settings.lnbits_ln_address_mode = "core_first"
     settings.lnbits_wallet_lightning_address_blacklist = ["admin"]
     settings.lnbits_charge_wallet_lightning_addresses = True
     settings.lnbits_wallet_lightning_address_price_sats = 1_000
diff --git a/tests/api/test_wallet_api.py b/tests/api/test_wallet_api.py
index d17f0cc29..d577f6cf7 100644
--- a/tests/api/test_wallet_api.py
+++ b/tests/api/test_wallet_api.py
@@ -182,7 +182,7 @@ async def test_wallet_api_custom_lightning_address_owner_rules(
     wallet = user.wallets[0]
     headers = _admin_headers(wallet.adminkey)
 
-    settings.lnbits_enable_wallet_lightning_addresses = True
+    settings.lnbits_ln_address_mode = "core_first"
     settings.lnbits_allow_custom_wallet_lightning_addresses = False
     disabled = await http_client.patch(
         "/api/v1/wallet",
@@ -253,7 +253,7 @@ async def test_wallet_api_custom_lightning_address_charges_fee(
     fee_wallet = fee_user.wallets[0]
     await update_wallet_balance(wallet=wallet, amount=2_000)
 
-    settings.lnbits_enable_wallet_lightning_addresses = True
+    settings.lnbits_ln_address_mode = "core_first"
     settings.lnbits_allow_custom_wallet_lightning_addresses = True
     settings.lnbits_charge_wallet_lightning_addresses = True
     settings.lnbits_wallet_lightning_address_price_sats = 1_000
diff --git a/tests/unit/test_settings.py b/tests/unit/test_settings.py
index 8c11301a4..521bfb538 100644
--- a/tests/unit/test_settings.py
+++ b/tests/unit/test_settings.py
@@ -41,13 +41,22 @@ nostrrelay_redirect_path: dict[str, Any] = {
 }
 
 
-@pytest.mark.parametrize("mode", ["core_first", "extension_first", "extension_only"])
+@pytest.mark.parametrize(
+    ("mode", "creation_allowed"),
+    [
+        ("core_first", True),
+        ("extension_first", True),
+        ("extension_only", False),
+    ],
+)
 def test_ln_address_mode(
     mode: Literal["core_first", "extension_first", "extension_only"],
+    creation_allowed: bool,
 ):
     users_settings = UsersSettings(lnbits_ln_address_mode=mode)
 
     assert users_settings.lnbits_ln_address_mode == mode
+    assert users_settings.ln_address_creation_allowed is creation_allowed
 
 
 def test_ln_address_mode_defaults_to_extension_first():