diff --git a/mRemoteNG/Connection/DefaultConnectionInheritance.cs b/mRemoteNG/Connection/DefaultConnectionInheritance.cs
index 82f2b0fd9..00e019c7b 100644
--- a/mRemoteNG/Connection/DefaultConnectionInheritance.cs
+++ b/mRemoteNG/Connection/DefaultConnectionInheritance.cs
@@ -28,9 +28,7 @@ namespace mRemoteNG.Connection
                 var propertyFromSettings = typeof(TSource).GetProperty(propertyNameMutator(property.Name));
                 if (propertyFromSettings == null)
                 {
-                    Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg,
-                                                        $"DefaultConInherit-LoadFrom: Could not load {property.Name}",
-                                                        true);
+                    Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, $"DefaultConInherit-LoadFrom: Could not load {property.Name}", true);
                     continue;
                 }
 
@@ -50,9 +48,7 @@ namespace mRemoteNG.Connection
                 var localValue = property.GetValue(Instance, null);
                 if (propertyFromSettings == null)
                 {
-                    Runtime.MessageCollector?.AddMessage(Messages.MessageClass.ErrorMsg,
-                                                         $"DefaultConInherit-SaveTo: Could not load {property.Name}",
-                                                         true);
+                    Runtime.MessageCollector?.AddMessage(Messages.MessageClass.ErrorMsg, $"DefaultConInherit-SaveTo: Could not load {property.Name}", true);
                     continue;
                 }
 
diff --git a/mRemoteNG/Properties/Settings.Designer.cs b/mRemoteNG/Properties/Settings.Designer.cs
index 8b0183a03..75f6bcae0 100644
--- a/mRemoteNG/Properties/Settings.Designer.cs
+++ b/mRemoteNG/Properties/Settings.Designer.cs
@@ -1390,70 +1390,54 @@ namespace mRemoteNG.Properties {
                 this["ConDefaultUseCredSsp"] = value;
             }
         }
-
-
+        
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("False")]
-        public bool InhDefaultUseRestrictedAdmin
-        {
-            get
-            {
+        public bool InhDefaultUseRestrictedAdmin {
+            get {
                 return ((bool)(this["InhDefaultUseRestrictedAdmin"]));
             }
-            set
-            {
+            set {
                 this["InhDefaultUseRestrictedAdmin"] = value;
             }
         }
-
+        
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("True")]
-        public bool ConDefaultUseRestrictedAdmin
-        {
-            get
-            {
+        public bool ConDefaultUseRestrictedAdmin {
+            get {
                 return ((bool)(this["ConDefaultUseRestrictedAdmin"]));
             }
-            set
-            {
+            set {
                 this["ConDefaultUseRestrictedAdmin"] = value;
             }
         }
-
-
+        
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("False")]
-        public bool InhDefaultUseRCG
-        {
-            get
-            {
+        public bool InhDefaultUseRCG {
+            get {
                 return ((bool)(this["InhDefaultUseRCG"]));
             }
-            set
-            {
+            set {
                 this["InhDefaultUseRCG"] = value;
             }
         }
-
+        
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("True")]
-        public bool ConDefaultUseRCG
-        {
-            get
-            {
+        public bool ConDefaultUseRCG {
+            get {
                 return ((bool)(this["ConDefaultUseRCG"]));
             }
-            set
-            {
+            set {
                 this["ConDefaultUseRCG"] = value;
             }
         }
-
-       
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2237,5 +2221,65 @@ namespace mRemoteNG.Properties {
                 this["ConDefaultRDPStartProgramWorkDir"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        public string ConDefaultEC2InstanceId {
+            get {
+                return ((string)(this["ConDefaultEC2InstanceId"]));
+            }
+            set {
+                this["ConDefaultEC2InstanceId"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        public string ConDefaultUserViaAPI {
+            get {
+                return ((string)(this["ConDefaultUserViaAPI"]));
+            }
+            set {
+                this["ConDefaultUserViaAPI"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        public string ConDefaultOpeningCommand {
+            get {
+                return ((string)(this["ConDefaultOpeningCommand"]));
+            }
+            set {
+                this["ConDefaultOpeningCommand"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool InhDefaultUserViaAPI {
+            get {
+                return ((bool)(this["InhDefaultUserViaAPI"]));
+            }
+            set {
+                this["InhDefaultUserViaAPI"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool InhDefaultOpeningCommand {
+            get {
+                return ((bool)(this["InhDefaultOpeningCommand"]));
+            }
+            set {
+                this["InhDefaultOpeningCommand"] = value;
+            }
+        }
     }
 }
diff --git a/mRemoteNG/Properties/Settings.settings b/mRemoteNG/Properties/Settings.settings
index 1855d9dae..f75b9d312 100644
--- a/mRemoteNG/Properties/Settings.settings
+++ b/mRemoteNG/Properties/Settings.settings
@@ -338,14 +338,12 @@
     <Setting Name="ConfirmCloseConnection" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">4</Value>
     </Setting>
-    
     <Setting Name="InhDefaultUseCredSsp" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
     <Setting Name="ConDefaultUseCredSsp" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-
     <Setting Name="InhDefaultUseRestrictedAdmin" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
@@ -358,7 +356,6 @@
     <Setting Name="ConDefaultUseRCG" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-
     <Setting Name="ConDefaultUseVmId" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
@@ -554,5 +551,20 @@
     <Setting Name="ConDefaultRDPStartProgramWorkDir" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="ConDefaultEC2InstanceId" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
+    <Setting Name="ConDefaultUserViaAPI" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
+    <Setting Name="ConDefaultOpeningCommand" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
+    <Setting Name="InhDefaultUserViaAPI" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="InhDefaultOpeningCommand" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file