diff --git a/TASVideos/Pages/Account/Register.cshtml b/TASVideos/Pages/Account/Register.cshtml
index 5849ff412..1c8a7fc68 100644
--- a/TASVideos/Pages/Account/Register.cshtml
+++ b/TASVideos/Pages/Account/Register.cshtml
@@ -42,7 +42,7 @@
 				<input asp-for="From" type="text" class="form-control" />
 				<span asp-validation-for="From" class="text-danger"></span>
 			</fieldset>
-			<form-group class="mt-3">
+			<fieldset class="mt-3">
 				<div class="form-check">
 					<label asp-for="Coppa" class="form-check-label"></label>
 					<input asp-for="Coppa" type="checkbox" class="form-check-input"/>
diff --git a/TASVideos/Pages/Forum/Topics/Move.cshtml b/TASVideos/Pages/Forum/Topics/Move.cshtml
index 086358791..4363d4a5a 100644
--- a/TASVideos/Pages/Forum/Topics/Move.cshtml
+++ b/TASVideos/Pages/Forum/Topics/Move.cshtml
@@ -13,7 +13,7 @@
 <form method="post">
 	<input type="hidden" asp-for="Topic.TopicTitle" />
 	<input type="hidden" asp-for="Topic.ForumName" />
-	<form-group class="col-lg-6">
+	<fieldset class="col-lg-6">
 		<label asp-for="Topic.ForumId" class="form-control-label"></label>
 		<select asp-for="Topic.ForumId" asp-items="Model.AvailableForums.OrderBy(f => f.Text)" class="form-control"></select>
 		<span asp-validation-for="Topic.ForumId" class="text-danger"></span>
diff --git a/TASVideos/Pages/Forum/Topics/Split.cshtml b/TASVideos/Pages/Forum/Topics/Split.cshtml
index d9fd4877c..2bad2474f 100644
--- a/TASVideos/Pages/Forum/Topics/Split.cshtml
+++ b/TASVideos/Pages/Forum/Topics/Split.cshtml
@@ -14,12 +14,12 @@
 	<input type="hidden" asp-for="Topic.ForumName" />
 	<input type="hidden" asp-for="Topic.ForumId" />
 	<input type="hidden" asp-for="Topic.Title" />
-	<form-group class="col-lg-6">
+	<fieldset class="col-lg-6">
 		<label asp-for="Topic.SplitToForumId" class="form-control-label"></label>
 		<select asp-for="Topic.SplitToForumId" asp-items="Model.AvailableForums.OrderBy(f => f.Text)" class="form-control"></select>
 		<span asp-validation-for="Topic.SplitToForumId" class="text-danger"></span>
 	</fieldset>
-	<form-group class="col-lg-6">
+	<fieldset class="col-lg-6">
 		<label asp-for="Topic.SplitTopicName" class="form-control-label"></label>
 		<input type="text" asp-for="Topic.SplitTopicName" class="form-control" />
 		<span asp-validation-for="Topic.SplitTopicName" class="text-danger"></span>
diff --git a/TASVideos/Pages/Messages/Create.cshtml b/TASVideos/Pages/Messages/Create.cshtml
index d8286a1b6..dfaf7d554 100644
--- a/TASVideos/Pages/Messages/Create.cshtml
+++ b/TASVideos/Pages/Messages/Create.cshtml
@@ -19,12 +19,12 @@
 
 <form method="POST" id="create-form">
 	<row>
-		<form-group class="col-lg-6">
+		<fieldset class="col-lg-6">
 			<label asp-for="Subject" class="form-control-label"></label>
 			<input type="text" asp-for="Subject" list="search-username-list" class="form-control" autocomplete="off" />
 			<span asp-validation-for="Subject" class="text-danger"></span>
 		</fieldset>
-		<form-group class="col-lg-6">
+		<fieldset class="col-lg-6">
 			<div id="user-form-group" class="mb-2">
 				<label asp-for="ToUser" class="form-control-label"></label>
 				<input type="text" asp-for="ToUser" class="form-control" autocomplete="off" placeholder="@Html.DescriptionFor(m => m.ToUser)"/>
@@ -39,7 +39,7 @@
 		<partial name="Forum/_CreatePostHelper" model="@("Text")" />
 	</fullrow>
 	<row>
-		<form-group class="col-12">
+		<fieldset class="col-12">
 			<label asp-for="Text" class="form-control-label"></label>
 			<textarea asp-for="Text" class="form-control" rows="20"></textarea>
 			<span asp-validation-for="Text" class="text-danger"></span>
diff --git a/TASVideos/Pages/Publications/EditFiles.cshtml b/TASVideos/Pages/Publications/EditFiles.cshtml
index 545a570d0..92b51a04b 100644
--- a/TASVideos/Pages/Publications/EditFiles.cshtml
+++ b/TASVideos/Pages/Publications/EditFiles.cshtml
@@ -39,7 +39,7 @@
 				<input asp-for="NewFile" class="form-control" />
 				<span asp-validation-for="NewFile" class="text-danger"></span>
 			</fieldset>
-			<form-group id="description-group">
+			<fieldset id="description-group">
 				<label asp-for="Description"></label>
 				<input type="text" asp-for="Description" class="form-control" />
 				<span asp-validation-for="Description" class="text-danger"></span>
diff --git a/TASVideos/Pages/Wiki/Edit.cshtml b/TASVideos/Pages/Wiki/Edit.cshtml
index ab6413b69..0f5c53ffe 100644
--- a/TASVideos/Pages/Wiki/Edit.cshtml
+++ b/TASVideos/Pages/Wiki/Edit.cshtml
@@ -16,7 +16,7 @@
 		<span asp-validation-for="PageToEdit.Markup" class="text-danger"></span>
 		@await Component.RenderWiki(SystemWiki.WikiEditHelp)
 	</fieldset>
-	<form-group class="col-12">
+	<fieldset class="col-12">
 		<label asp-for="PageToEdit.RevisionMessage" class="form-control-label"></label>
 		<div class="input-group">
 			<input type="text" asp-for="PageToEdit.RevisionMessage" class="form-control" autocomplete="off" />