diff --git a/EduNetworkBuilder/App.config b/EduNetworkBuilder/App.config
index b358003..6349420 100644
--- a/EduNetworkBuilder/App.config
+++ b/EduNetworkBuilder/App.config
@@ -37,6 +37,9 @@
             <setting name="ProcessingLevel" serializeAs="String">
                 <value>none</value>
             </setting>
+            <setting name="AutoDHCP" serializeAs="String">
+                <value>False</value>
+            </setting>
         </EduNetworkBuilder.Properties.Settings>
     </userSettings>
 </configuration>
\ No newline at end of file
diff --git a/EduNetworkBuilder/NBSettings.cs b/EduNetworkBuilder/NBSettings.cs
index 639898c..7096dfc 100644
--- a/EduNetworkBuilder/NBSettings.cs
+++ b/EduNetworkBuilder/NBSettings.cs
@@ -32,6 +32,7 @@ namespace EduNetworkBuilder
         public int MainWindowHeight = -1;
         public string ProcessingLevel = "none";
         public UInt32 NextID = 100;
+        public bool AutoDHCPAllMachinesAtNetworkLoad = false; //Mainly for teachers
         
         public NBSettings()
         {
@@ -63,6 +64,7 @@ namespace EduNetworkBuilder
             ToClass.MainWindowHeight = FromClass.MainWindowHeight;
             ToClass.MainWindowWidth = FromClass.MainWindowWidth;
             ToClass.BelongsToUser = FromClass.BelongsToUser;
+            ToClass.AutoDHCPAllMachinesAtNetworkLoad = FromClass.AutoDHCPAllMachinesAtNetworkLoad;
 
             foreach (string one in FromClass.ScoreList)
             {
@@ -114,6 +116,7 @@ namespace EduNetworkBuilder
                 MainWindowY = Properties.Settings.Default.MainWindowY;
                 MainWindowHeight = Properties.Settings.Default.MainWindowHeight;
                 MainWindowWidth = Properties.Settings.Default.MainWindowWidth;
+                AutoDHCPAllMachinesAtNetworkLoad = Properties.Settings.Default.AutoDHCP;
 
                 foreach(string one in Properties.Settings.Default.ScoreList)
                 {
@@ -243,6 +246,7 @@ namespace EduNetworkBuilder
                 Properties.Settings.Default.MainWindowY = MainWindowY;
                 Properties.Settings.Default.MainWindowHeight = MainWindowHeight;
                 Properties.Settings.Default.MainWindowWidth = MainWindowWidth;
+                Properties.Settings.Default.AutoDHCP = AutoDHCPAllMachinesAtNetworkLoad;
 
                 Properties.Settings.Default.ScoreList.Clear();
                 foreach(string One in ScoreList)
diff --git a/EduNetworkBuilder/Properties/Settings.Designer.cs b/EduNetworkBuilder/Properties/Settings.Designer.cs
index 6767089..451b5b9 100644
--- a/EduNetworkBuilder/Properties/Settings.Designer.cs
+++ b/EduNetworkBuilder/Properties/Settings.Designer.cs
@@ -152,5 +152,17 @@ namespace EduNetworkBuilder.Properties {
                 this["RecentFiles"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool AutoDHCP {
+            get {
+                return ((bool)(this["AutoDHCP"]));
+            }
+            set {
+                this["AutoDHCP"] = value;
+            }
+        }
     }
 }
diff --git a/EduNetworkBuilder/Properties/Settings.settings b/EduNetworkBuilder/Properties/Settings.settings
index 5698311..6290b5d 100644
--- a/EduNetworkBuilder/Properties/Settings.settings
+++ b/EduNetworkBuilder/Properties/Settings.settings
@@ -35,5 +35,8 @@
     <Setting Name="RecentFiles" Type="System.Collections.Specialized.StringCollection" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="AutoDHCP" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file