diff --git a/mRemoteV1/App/App.Info.vb b/mRemoteV1/App/App.Info.vb
index 5b898675b..d804e3e75 100644
--- a/mRemoteV1/App/App.Info.vb
+++ b/mRemoteV1/App/App.Info.vb
@@ -15,7 +15,7 @@ Namespace App
 
         Public Class Settings
 #If Not PORTABLE Then
-            Public Shared ReadOnly SettingsPath As String = GetFolderPath(SpecialFolder.LocalApplicationData) & "\" & My.Application.Info.ProductName
+            Public Shared ReadOnly SettingsPath As String = GetFolderPath(SpecialFolder.ApplicationData) & "\" & My.Application.Info.ProductName
 #Else
             Public Shared ReadOnly SettingsPath As String = My.Application.Info.DirectoryPath
 #End If
diff --git a/mRemoteV1/My Project/Settings.Designer.vb b/mRemoteV1/My Project/Settings.Designer.vb
index ee7231c36..3445f4dcc 100644
--- a/mRemoteV1/My Project/Settings.Designer.vb	
+++ b/mRemoteV1/My Project/Settings.Designer.vb	
@@ -1,7 +1,7 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     Dieser Code wurde von einem Tool generiert.
-'     Laufzeitversion:2.0.50727.4952
+'     Laufzeitversion:2.0.50727.5444
 '
 '     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
 '     der Code erneut generiert wird.
@@ -1950,22 +1950,28 @@ Namespace My
             End Set
         End Property
         
-        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.Configuration.DefaultSettingValueAttribute("Never")>  _
-        Public ReadOnly Property ConDefaultRDGatewayUsageMethod() As String
+        Public Property ConDefaultRDGatewayUsageMethod() As String
             Get
                 Return CType(Me("ConDefaultRDGatewayUsageMethod"),String)
             End Get
+            Set
+                Me("ConDefaultRDGatewayUsageMethod") = value
+            End Set
         End Property
         
-        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.Configuration.DefaultSettingValueAttribute("Yes")>  _
-        Public ReadOnly Property ConDefaultRDGatewayUseConnectionCredentials() As String
+        Public Property ConDefaultRDGatewayUseConnectionCredentials() As String
             Get
                 Return CType(Me("ConDefaultRDGatewayUseConnectionCredentials"),String)
             End Get
+            Set
+                Me("ConDefaultRDGatewayUseConnectionCredentials") = value
+            End Set
         End Property
         
         <Global.System.Configuration.UserScopedSettingAttribute(),  _
diff --git a/mRemoteV1/My Project/Settings.settings b/mRemoteV1/My Project/Settings.settings
index 7b248d8eb..327045c89 100644
--- a/mRemoteV1/My Project/Settings.settings	
+++ b/mRemoteV1/My Project/Settings.settings	
@@ -440,10 +440,10 @@
     <Setting Name="UpdatePending" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="ConDefaultRDGatewayUsageMethod" Type="System.String" Scope="Application">
+    <Setting Name="ConDefaultRDGatewayUsageMethod" Type="System.String" Scope="User">
       <Value Profile="(Default)">Never</Value>
     </Setting>
-    <Setting Name="ConDefaultRDGatewayUseConnectionCredentials" Type="System.String" Scope="Application">
+    <Setting Name="ConDefaultRDGatewayUseConnectionCredentials" Type="System.String" Scope="User">
       <Value Profile="(Default)">Yes</Value>
     </Setting>
     <Setting Name="ConDefaultIcon" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
diff --git a/mRemoteV1/app.config b/mRemoteV1/app.config
index 542ed8989..82c54f14f 100644
--- a/mRemoteV1/app.config
+++ b/mRemoteV1/app.config
@@ -5,9 +5,6 @@
         <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
             <section name="mRemoteNG.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
         </sectionGroup>
-        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="mRemoteNG.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-        </sectionGroup>
     </configSections>
     <log4net>
 			<logger name="mRemoteNG.Log">
@@ -497,6 +494,12 @@
             <setting name="UpdatePending" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="ConDefaultRDGatewayUsageMethod" serializeAs="String">
+                <value>Never</value>
+            </setting>
+            <setting name="ConDefaultRDGatewayUseConnectionCredentials" serializeAs="String">
+                <value>Yes</value>
+            </setting>
             <setting name="ConDefaultIcon" serializeAs="String">
                 <value>mRemoteNG</value>
             </setting>
@@ -523,14 +526,4 @@
             </setting>
         </mRemoteNG.My.MySettings>
     </userSettings>
-    <applicationSettings>
-        <mRemoteNG.My.MySettings>
-            <setting name="ConDefaultRDGatewayUsageMethod" serializeAs="String">
-                <value>Never</value>
-            </setting>
-            <setting name="ConDefaultRDGatewayUseConnectionCredentials" serializeAs="String">
-                <value>Yes</value>
-            </setting>
-        </mRemoteNG.My.MySettings>
-    </applicationSettings>
 </configuration>