diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index 7bc543dbbc..f5ce7c3446 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -1141,6 +1141,8 @@ EOD;
 		reload_all_sync();
 		
 		echo " done!\n";
+		
+		touch("{$g['tmp_path']}/assign_complete");
 
 	}
 }
diff --git a/etc/rc.bootup b/etc/rc.bootup
index 8831bb1b6a..7e06ed2e13 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -81,7 +81,7 @@
 				$do_assign = 1;
 			}
 		}
-		if($do_assign == 1) {
+		if($do_assign == 1 and !file_exists("{$g['tmp_path']}/assign_complete")) {
 			$noreboot = true;
 			echo " -- Running interface assignment option.\n";
 			set_networking_interfaces_ports();