diff --git a/src/migration-scripts/pppoe-server/6-to-7 b/src/migration-scripts/pppoe-server/6-to-7
index 8b5482705..34996d8fe 100755
--- a/src/migration-scripts/pppoe-server/6-to-7
+++ b/src/migration-scripts/pppoe-server/6-to-7
@@ -1,109 +1,111 @@
 #!/usr/bin/env python3
 #
 # Copyright (C) 2023 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
 # published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # - move all pool to named pools
 #       'start-stop' migrate to namedpool 'default-range-pool'
 #       'subnet' migrate to namedpool 'default-subnet-pool'
 #       'default-subnet-pool' is the next pool for 'default-range-pool'
 # - There is only one gateway-address, take the first which is configured
 # - default-pool by migration.
 #       1. If authentication mode = 'local' then it is first named pool.
 #       If there are not named pools, namedless pool will be default.
 #       2. If authentication mode = 'radius' then namedless pool will be default
 
 import os
 
 from sys import argv
 from sys import exit
 from vyos.configtree import ConfigTree
 
 
 if len(argv) < 2:
     print("Must specify file name!")
     exit(1)
 
 file_name = argv[1]
 
 with open(file_name, 'r') as f:
     config_file = f.read()
 
 config = ConfigTree(config_file)
 base = ['service', 'pppoe-server']
 pool_base = base + ['client-ip-pool']
 if not config.exists(base):
     exit(0)
 
 if not config.exists(pool_base):
     exit(0)
 default_pool = ''
 range_pool_name = 'default-range-pool'
 subnet_pool_name = 'default-subnet-pool'
 #Default nameless pools migrations
 if config.exists(pool_base + ['subnet']):
     subnet = config.return_value(pool_base + ['subnet'])
     config.delete(pool_base + ['subnet'])
     config.set(pool_base + [subnet_pool_name, 'range'], value=subnet)
     default_pool = subnet_pool_name
 
 if config.exists(pool_base + ['start']) and config.exists(pool_base + ['stop']):
     start_ip = config.return_value(pool_base + ['start'])
     stop_ip = config.return_value(pool_base + ['stop'])
     ip_range = f'{start_ip}-{stop_ip}'
     config.delete(pool_base + ['start'])
     config.delete(pool_base + ['stop'])
     config.set(pool_base + [range_pool_name, 'range'], value=ip_range)
     if default_pool:
         config.set(pool_base + [range_pool_name, 'next-pool'],
                    value=subnet_pool_name)
     default_pool = range_pool_name
 
 gateway = ''
 if config.exists(base + ['gateway-address']):
     gateway = config.return_value(base + ['gateway-address'])
 
 #named pool migration
 namedpools_base = pool_base + ['name']
-if config.return_value(base + ['authentication', 'mode']) == 'local':
-    if config.list_nodes(namedpools_base):
-        default_pool = config.list_nodes(namedpools_base)[0]
-
-for pool_name in config.list_nodes(namedpools_base):
-    pool_path = namedpools_base + [pool_name]
-    if config.exists(pool_path + ['subnet']):
-        subnet = config.return_value(pool_path + ['subnet'])
-        config.set(pool_base + [pool_name, 'range'], value=subnet)
-    if config.exists(pool_path + ['next-pool']):
-        next_pool = config.return_value(pool_path + ['next-pool'])
-        config.set(pool_base + [pool_name, 'next-pool'], value=next_pool)
-    if not gateway:
-        if config.exists(pool_path + ['gateway-address']):
-            gateway = config.return_value(pool_path + ['gateway-address'])
-
-config.delete(namedpools_base)
+if config.exists(namedpools_base):
+    if config.exists(base + ['authentication', 'mode']):
+        if config.return_value(base + ['authentication', 'mode']) == 'local':
+            if config.list_nodes(namedpools_base):
+                default_pool = config.list_nodes(namedpools_base)[0]
+
+    for pool_name in config.list_nodes(namedpools_base):
+        pool_path = namedpools_base + [pool_name]
+        if config.exists(pool_path + ['subnet']):
+            subnet = config.return_value(pool_path + ['subnet'])
+            config.set(pool_base + [pool_name, 'range'], value=subnet)
+        if config.exists(pool_path + ['next-pool']):
+            next_pool = config.return_value(pool_path + ['next-pool'])
+            config.set(pool_base + [pool_name, 'next-pool'], value=next_pool)
+        if not gateway:
+            if config.exists(pool_path + ['gateway-address']):
+                gateway = config.return_value(pool_path + ['gateway-address'])
+
+    config.delete(namedpools_base)
 
 if gateway:
     config.set(base + ['gateway-address'], value=gateway)
 if default_pool:
     config.set(base + ['default-pool'], value=default_pool)
 # format as tag node
 config.set_tag(pool_base)
 
 try:
     with open(file_name, 'w') as f:
         f.write(config.to_string())
 except OSError as e:
     print("Failed to save the modified config: {}".format(e))
     exit(1)