diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj
index 5a09b8b29..32950a90c 100644
--- a/src/Orchard.Web/Orchard.Web.csproj
+++ b/src/Orchard.Web/Orchard.Web.csproj
@@ -128,6 +128,10 @@
       <Project>{1ECC1131-0D0C-4822-AD90-E979868C63F3}</Project>
       <Name>Orchard.CmsPages</Name>
     </ProjectReference>
+    <ProjectReference Include="Packages\Orchard.Comments\Orchard.Comments.csproj">
+      <Project>{14C049FD-B35B-415A-A824-87F26B26E7FD}</Project>
+      <Name>Orchard.Comments</Name>
+    </ProjectReference>
     <ProjectReference Include="Packages\Orchard.DevTools\Orchard.DevTools.csproj">
       <Project>{67C1D3AF-A0EC-46B2-BAE1-DF1DA8E0B890}</Project>
       <Name>Orchard.DevTools</Name>
diff --git a/src/Orchard.Web/Packages/Orchard.Comments/Models/CommentSettings.cs b/src/Orchard.Web/Packages/Orchard.Comments/Models/CommentSettings.cs
new file mode 100644
index 000000000..06e6a96c6
--- /dev/null
+++ b/src/Orchard.Web/Packages/Orchard.Comments/Models/CommentSettings.cs
@@ -0,0 +1,21 @@
+using Orchard.Data;
+using Orchard.Models;
+using Orchard.Models.Driver;
+using Orchard.Models.Records;
+
+namespace Orchard.Comments.Models {
+    public class CommentSettingsRecord : ContentPartRecord {
+        public virtual bool RequireLoginToAddComment { get; set; }
+        public virtual bool EnableCommentsOnPages { get; set; }
+        public virtual bool EnableCommentsOnPosts { get; set; }
+    }
+
+    public class CommentSettingsHandler : ContentHandler {
+        public CommentSettingsHandler(IRepository<CommentSettingsRecord> repository) {
+            Filters.Add(new ActivatingFilter<ContentPartForRecord<CommentSettingsRecord>>("site"));
+            Filters.Add(new StorageFilterForRecord<CommentSettingsRecord>(repository) { AutomaticallyCreateMissingRecord = true });
+            Filters.Add(new TemplateFilterForRecord<CommentSettingsRecord>("CommentSettings"));
+        }
+    }
+
+}
diff --git a/src/Orchard.Web/Packages/Orchard.Comments/Orchard.Comments.csproj b/src/Orchard.Web/Packages/Orchard.Comments/Orchard.Comments.csproj
index 56e805ee9..5a824d86c 100644
--- a/src/Orchard.Web/Packages/Orchard.Comments/Orchard.Comments.csproj
+++ b/src/Orchard.Web/Packages/Orchard.Comments/Orchard.Comments.csproj
@@ -61,9 +61,12 @@
     <Reference Include="System.Web.Mobile" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Models\CommentSettings.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Package.txt" />
+    <Content Include="Views\Models\EditorTemplates\CommentSettingsRecord.ascx" />
     <Content Include="Web.config" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
@@ -77,7 +80,6 @@
     <Folder Include="App_Data\" />
     <Folder Include="Content\" />
     <Folder Include="Controllers\" />
-    <Folder Include="Models\" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets" />
diff --git a/src/Orchard.Web/Packages/Orchard.Comments/Package.txt b/src/Orchard.Web/Packages/Orchard.Comments/Package.txt
new file mode 100644
index 000000000..ee782de3b
--- /dev/null
+++ b/src/Orchard.Web/Packages/Orchard.Comments/Package.txt
@@ -0,0 +1 @@
+name: Comments
diff --git a/src/Orchard.Web/Packages/Orchard.Comments/Views/Models/EditorTemplates/CommentSettingsRecord.ascx b/src/Orchard.Web/Packages/Orchard.Comments/Views/Models/EditorTemplates/CommentSettingsRecord.ascx
new file mode 100644
index 000000000..f6db38054
--- /dev/null
+++ b/src/Orchard.Web/Packages/Orchard.Comments/Views/Models/EditorTemplates/CommentSettingsRecord.ascx
@@ -0,0 +1,19 @@
+<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<Orchard.Comments.Models.CommentSettingsRecord>" %>
+<h3>Comments</h3>
+<ol>
+    <li>
+        <%= Html.LabelFor(x=>x.RequireLoginToAddComment) %>
+        <%= Html.EditorFor(x=>x.RequireLoginToAddComment) %>
+        <%= Html.ValidationMessage("RequireLoginToAddComment", "*")%>
+    </li>
+    <li>
+        <%= Html.LabelFor(x=>x.EnableCommentsOnPages) %>
+        <%= Html.EditorFor(x=>x.EnableCommentsOnPages) %>
+        <%= Html.ValidationMessage("EnableCommentsOnPages", "*")%>
+    </li>
+    <li>
+        <%= Html.LabelFor(x=>x.EnableCommentsOnPosts) %>
+        <%= Html.EditorFor(x=>x.EnableCommentsOnPosts) %>
+        <%= Html.ValidationMessage("EnableCommentsOnPosts", "*")%>
+    </li>
+</ol>
diff --git a/src/Orchard.Web/Packages/Orchard.Comments/Web.config b/src/Orchard.Web/Packages/Orchard.Comments/Web.config
index d38df4e6d..f57bcb3cc 100644
--- a/src/Orchard.Web/Packages/Orchard.Comments/Web.config
+++ b/src/Orchard.Web/Packages/Orchard.Comments/Web.config
@@ -50,55 +50,6 @@
       </assemblies>
     </compilation>
 
-    <!--
-            The <authentication> section enables configuration 
-            of the security authentication mode used by 
-            ASP.NET to identify an incoming user. 
-    -->
-    <authentication mode="Forms">
-      <forms loginUrl="~/Account/LogOn" timeout="2880" />
-    </authentication>
-
-    <membership>
-      <providers>
-        <clear/>
-        <add name="AspNetSqlMembershipProvider"
-             type="System.Web.Security.SqlMembershipProvider, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
-             connectionStringName="ApplicationServices"
-             enablePasswordRetrieval="false"
-             enablePasswordReset="true"
-             requiresQuestionAndAnswer="false"
-             requiresUniqueEmail="false"
-             passwordFormat="Hashed"
-             maxInvalidPasswordAttempts="5"
-             minRequiredPasswordLength="6"
-             minRequiredNonalphanumericCharacters="0"
-             passwordAttemptWindow="10"
-             passwordStrengthRegularExpression=""
-             applicationName="/"
-                />
-      </providers>
-    </membership>
-
-    <profile>
-      <providers>
-        <clear/>
-        <add name="AspNetSqlProfileProvider"
-             type="System.Web.Profile.SqlProfileProvider, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
-             connectionStringName="ApplicationServices"
-             applicationName="/"
-                />
-      </providers>
-    </profile>
-
-    <roleManager enabled="false">
-      <providers>
-        <clear />
-        <add connectionStringName="ApplicationServices" applicationName="/" name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-        <add applicationName="/" name="AspNetWindowsTokenRoleProvider" type="System.Web.Security.WindowsTokenRoleProvider, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-      </providers>
-    </roleManager>
-
     <!--
             The <customErrors> section enables configuration 
             of what to do if/when an unhandled error occurs 
diff --git a/src/Orchard/Data/HackSessionLocator.cs b/src/Orchard/Data/HackSessionLocator.cs
index e36d411ec..d079a2f84 100644
--- a/src/Orchard/Data/HackSessionLocator.cs
+++ b/src/Orchard/Data/HackSessionLocator.cs
@@ -33,6 +33,7 @@ namespace Orchard.Data {
                     CreatePersistenceModel(Assembly.Load("Orchard.Media")),
                     CreatePersistenceModel(Assembly.Load("Orchard.Core")),
                     CreatePersistenceModel(Assembly.Load("Orchard.Wikis")),
+                    CreatePersistenceModel(Assembly.Load("Orchard.Comments")),
                 };
 
                 return _sessionFactory ??