diff --git a/ProjectLighthouse/Controllers/Website/SlotPageController.cs b/ProjectLighthouse/Controllers/Website/SlotPageController.cs
index 73481dc0..4c02a856 100644
--- a/ProjectLighthouse/Controllers/Website/SlotPageController.cs
+++ b/ProjectLighthouse/Controllers/Website/SlotPageController.cs
@@ -37,14 +37,14 @@ public class SlotPageController : ControllerBase
     }
 
     [HttpGet("postComment")]
-    public async Task<IActionResult> PostComment([FromRoute] int id, [FromQuery] string msg)
+    public async Task<IActionResult> PostComment([FromRoute] int id, [FromQuery] string? msg)
     {
         User? user = this.database.UserFromWebRequest(this.Request);
         if (user == null) return this.Redirect("~/login");
 
-        bool success = await this.database.PostComment(user, id, CommentType.Level, msg);
+        if (msg == null) return this.Redirect("~/slot/" + id);
 
-        if (!success) return this.NotFound();
+        await this.database.PostComment(user, id, CommentType.Level, msg);
 
         return this.Redirect("~/slot/" + id);
     }
diff --git a/ProjectLighthouse/Controllers/Website/UserPageController.cs b/ProjectLighthouse/Controllers/Website/UserPageController.cs
index 2008f4ae..f3ace5eb 100644
--- a/ProjectLighthouse/Controllers/Website/UserPageController.cs
+++ b/ProjectLighthouse/Controllers/Website/UserPageController.cs
@@ -35,25 +35,25 @@ public class UserPageController : ControllerBase
     }
 
     [HttpGet("rateComment")]
-    public async Task<IActionResult> RateComment([FromRoute] int id, [FromQuery] int commentId, [FromQuery] int rating)
+    public async Task<IActionResult> RateComment([FromRoute] int id, [FromQuery] int? commentId, [FromQuery] int? rating)
     {
         User? user = this.database.UserFromWebRequest(this.Request);
         if (user == null) return this.Redirect("~/login");
 
-        await this.database.RateComment(user, commentId, rating);
+        await this.database.RateComment(user, commentId.GetValueOrDefault(), rating.GetValueOrDefault());
 
         return this.Redirect("~/user/" + id + "#" + commentId);
     }
 
     [HttpGet("postComment")]
-    public async Task<IActionResult> PostComment([FromRoute] int id, [FromQuery] string msg)
+    public async Task<IActionResult> PostComment([FromRoute] int id, [FromQuery] string? msg)
     {
         User? user = this.database.UserFromWebRequest(this.Request);
         if (user == null) return this.Redirect("~/login");
 
-        bool success = await this.database.PostComment(user, id, CommentType.Profile, msg);
+        if (msg == null) return this.Redirect("~/user/" + id);
 
-        if (!success) return this.NotFound();
+        await this.database.PostComment(user, id, CommentType.Profile, msg);
 
         return this.Redirect("~/user/" + id);
     }
diff --git a/ProjectLighthouse/Pages/Partials/CommentsPartial.cshtml b/ProjectLighthouse/Pages/Partials/CommentsPartial.cshtml
index 9b4b4107..3a4420ce 100644
--- a/ProjectLighthouse/Pages/Partials/CommentsPartial.cshtml
+++ b/ProjectLighthouse/Pages/Partials/CommentsPartial.cshtml
@@ -62,7 +62,7 @@
             </div>
         </div>
     }
-    @if(Model.CommentsEnabled){
+    @if(Model.CommentsEnabled && Model.User != null){
         <div class="ui divider"></div>
         <form class="ui reply form" action="@Url.RouteUrl(ViewContext.RouteData.Values)/postComment">
             <div class="field">