diff --git a/WebsitePanel/Database/install_db.sql b/WebsitePanel/Database/install_db.sql
index 75fc6abe..3efd1a64 100644
--- a/WebsitePanel/Database/install_db.sql
+++ b/WebsitePanel/Database/install_db.sql
@@ -24160,6 +24160,8 @@ INSERT [dbo].[ServiceDefaultProperties] ([ProviderID], [PropertyName], [Property
 GO
 INSERT [dbo].[ServiceDefaultProperties] ([ProviderID], [PropertyName], [PropertyValue]) VALUES (12, N'InstallFolder', N'%PROGRAMFILES%\Gene6 FTP Server')
 GO
+INSERT [dbo].[ServiceDefaultProperties] ([ProviderID], [PropertyName], [PropertyValue]) VALUES (12, N'LogsFolder', N'%PROGRAMFILES%\Gene6 FTP Server\Log')
+GO
 INSERT [dbo].[ServiceDefaultProperties] ([ProviderID], [PropertyName], [PropertyValue]) VALUES (14, N'AdminPassword', N'')
 GO
 INSERT [dbo].[ServiceDefaultProperties] ([ProviderID], [PropertyName], [PropertyValue]) VALUES (14, N'AdminUsername', N'admin')
diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql
index 950e401e..9f6c49be 100644
--- a/WebsitePanel/Database/update_db.sql
+++ b/WebsitePanel/Database/update_db.sql
@@ -827,3 +827,9 @@ BEGIN
 END
 GO
 
+IF NOT EXISTS (SELECT * FROM [dbo].[ServiceDefaultProperties] WHERE [ProviderID] = 12 AND [PropertyName] = 'LogsFolder')
+BEGIN
+	INSERT [dbo].[ServiceDefaultProperties] ([ProviderID], [PropertyName], [PropertyValue]) VALUES (12, N'LogsFolder', N'%PROGRAMFILES%\Gene6 FTP Server\Log')
+END
+GO
+
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.FTP.Gene6/Gene6FTP.cs b/WebsitePanel/Sources/WebsitePanel.Providers.FTP.Gene6/Gene6FTP.cs
index 7bee1650..66286ced 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.FTP.Gene6/Gene6FTP.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.FTP.Gene6/Gene6FTP.cs
@@ -52,6 +52,11 @@ namespace WebsitePanel.Providers.FTP
         {
             get { return FileUtils.EvaluateSystemVariables(ProviderSettings["InstallFolder"]); }
         }
+
+        protected string LogsFolder
+        {
+            get { return FileUtils.EvaluateSystemVariables(ProviderSettings["LogsFolder"]); }
+        }
         #endregion
 
         #region Sites
@@ -589,7 +594,13 @@ TransferLimitType=never");
 
         private string GetLogsPath()
         {
-            return GetInstallFolder() + "Log";
+            if (String.IsNullOrEmpty(LogsFolder))
+                return GetInstallFolder() + "Log";
+            else
+            {
+                string folder = LogsFolder.Replace("/", "\\");
+                return folder.TrimEnd('\\');
+            }
         }
 
         private void WriteTextFile(string path, string content)
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/Gene6FTP_Settings.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/Gene6FTP_Settings.ascx
index 38fcc97f..4daf17b7 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/Gene6FTP_Settings.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/Gene6FTP_Settings.ascx
@@ -1,14 +1,21 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Gene6FTP_Settings.ascx.cs" Inherits="WebsitePanel.Portal.ProviderControls.Gene6FTP_Settings" %>
 <table cellpadding="4" cellspacing="0" width="100%">
 	<tr>
-	    <td class="SubHead" valign="top">
+	    <td class="SubHead" nowrap="nowrap">
 	        <asp:Label ID="lblInstallFolder" runat="server" meta:resourcekey="lblInstallFolder" Text="Installation Folder:"></asp:Label>
 	    </td>
 	    <td class="Normal" valign="top">
             <asp:TextBox ID="txtInstallFolder" runat="server" CssClass="NormalTextBox" Width="300px"></asp:TextBox></td>
 	</tr>
 	<tr>
-		<td class="SubHead" width="200" nowrap>
+	    <td class="SubHead" nowrap="nowrap">
+	        <asp:Label ID="lblLogsFolder" runat="server" meta:resourcekey="lblLogsFolder" Text="Logs Folder:"></asp:Label>
+	    </td>
+	    <td class="Normal" valign="top">
+            <asp:TextBox ID="txtLogsFolder" runat="server" CssClass="NormalTextBox" Width="300px"></asp:TextBox></td>
+	</tr>
+	<tr>
+		<td class="SubHead"  nowrap="nowrap">
 		    <asp:Label ID="lblSite" runat="server" meta:resourcekey="lblSite" Text="FTP Accounts Site:"></asp:Label>
 		</td>
 		<td width="100%">
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/Gene6FTP_Settings.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/Gene6FTP_Settings.ascx.cs
index 705612dd..5a301b16 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/Gene6FTP_Settings.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/Gene6FTP_Settings.ascx.cs
@@ -64,14 +64,16 @@ namespace WebsitePanel.Portal.ProviderControls
             Utils.SelectListItem(ddlFtpSite, settings["SiteId"]);
 
             txtInstallFolder.Text = settings["InstallFolder"];
-			chkBuildUncFilesPath.Checked = Utils.ParseBool(settings["BuildUncFilesPath"], false);
+            txtLogsFolder.Text = settings["LogsFolder"];
+            chkBuildUncFilesPath.Checked = Utils.ParseBool(settings["BuildUncFilesPath"], false);
         }
 
         public void SaveSettings(StringDictionary settings)
         {
             settings["SiteId"] = ddlFtpSite.SelectedValue;
             settings["InstallFolder"] = txtInstallFolder.Text.Trim();
-			settings["BuildUncFilesPath"] = chkBuildUncFilesPath.Checked.ToString();
+            settings["LogsFolder"] = txtLogsFolder.Text.Trim();
+            settings["BuildUncFilesPath"] = chkBuildUncFilesPath.Checked.ToString();
         }
     }
 }
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/Gene6FTP_Settings.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/Gene6FTP_Settings.ascx.designer.cs
index 81189130..40927e54 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/Gene6FTP_Settings.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/Gene6FTP_Settings.ascx.designer.cs
@@ -13,6 +13,8 @@ namespace WebsitePanel.Portal.ProviderControls {
     public partial class Gene6FTP_Settings {
         protected System.Web.UI.WebControls.Label lblInstallFolder;
         protected System.Web.UI.WebControls.TextBox txtInstallFolder;
+        protected System.Web.UI.WebControls.Label lblLogsFolder;
+        protected System.Web.UI.WebControls.TextBox txtLogsFolder;
         protected System.Web.UI.WebControls.Label lblSite;
         protected System.Web.UI.WebControls.DropDownList ddlFtpSite;
         protected System.Web.UI.WebControls.Label lblBuildUncFilesPath;