diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Controllers/CommentController.cs b/src/Orchard.Web/Modules/Orchard.Comments/Controllers/CommentController.cs
index ace820b8c..98e5459ad 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Controllers/CommentController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Controllers/CommentController.cs
@@ -32,9 +32,10 @@ namespace Orchard.Comments.Controllers {
 
             var comment = Services.ContentManager.New("Comment");
 
-            Services.ContentManager.Create(comment);
             var editorShape = Services.ContentManager.UpdateEditor(comment, this);
 
+            Services.ContentManager.Create(comment);
+
             if (ModelState.IsValid) {
                 if (comment.Has<CommentPart>()) {
                     var commentPart = comment.As<CommentPart>();
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Tokens/CommentTokens.cs b/src/Orchard.Web/Modules/Orchard.Comments/Tokens/CommentTokens.cs
index 94b9dff2b..39176a1a1 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Tokens/CommentTokens.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Tokens/CommentTokens.cs
@@ -30,16 +30,16 @@ namespace Orchard.Comments.Tokens {
 
         public void Evaluate(dynamic context) {
             context.For<IContent>("Content")
-                .Token("CommentedOn", (Func<IContent, object>)(content => content.As<CommentPart>().Record.CommentedOn))
-                .Chain("CommentedOn", "Content", (Func<IContent, object>)(content => _contentManager.Get(content.As<CommentPart>().Record.CommentedOn)))
-                .Token("CommentMessage", (Func<IContent, object>)(content => content.As<CommentPart>().Record.CommentText))
+                .Token("CommentedOn", (Func<IContent, object>)(content => content.As<CommentPart>().CommentedOn))
+                .Chain("CommentedOn", "Content", (Func<IContent, object>)(content => _contentManager.Get(content.As<CommentPart>().CommentedOn)))
+                .Token("CommentMessage", (Func<IContent, object>)(content => content.As<CommentPart>().CommentText))
                 .Token("CommentAuthor", (Func<IContent, object>)CommentAuthor)
                 ;
         }
 
         private static string CommentAuthor(IContent comment) {
             var commentPart = comment.As<CommentPart>();
-            return String.IsNullOrWhiteSpace(commentPart.Record.UserName) ? commentPart.Record.Author : commentPart.Record.UserName;
+            return String.IsNullOrWhiteSpace(commentPart.UserName) ? commentPart.Author : commentPart.UserName;
         }
     }
 }
\ No newline at end of file