diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Edit.razor b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Edit.razor
index cd845092..339879f8 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Edit.razor
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Edit.razor
@@ -10,10 +10,10 @@
 <table class="table table-borderless">
     <tr>
         <td>
-            <label class="control-label">Name: </label>
+            <Label For="name" HelpText="Enter a name">Name: </Label>
         </td>
         <td>
-            <input id="_name" class="form-control" @bind="@_name" />
+            <input id="name" class="form-control" @bind="@_name" />
         </td>
     </tr>
 </table>
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Settings.razor b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Settings.razor
index 415b24ca..7989d7c9 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Settings.razor
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Settings.razor
@@ -5,10 +5,10 @@
 <table class="table table-borderless">
     <tr>
         <td>
-            <label for="Setting" class="control-label">Setting: </label>
+            <Label For="value" HelpText="Enter a value">Name: </Label>
         </td>
         <td>
-            <input type="text" class="form-control" @bind="_value" />
+            <input id="value" type="text" class="form-control" @bind="@_value" />
         </td>
     </tr>
 </table>
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Client/Modules/[Owner].[Module]/Edit.razor b/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Client/Modules/[Owner].[Module]/Edit.razor
index cd845092..339879f8 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Client/Modules/[Owner].[Module]/Edit.razor
+++ b/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Client/Modules/[Owner].[Module]/Edit.razor
@@ -10,10 +10,10 @@
 <table class="table table-borderless">
     <tr>
         <td>
-            <label class="control-label">Name: </label>
+            <Label For="name" HelpText="Enter a name">Name: </Label>
         </td>
         <td>
-            <input id="_name" class="form-control" @bind="@_name" />
+            <input id="name" class="form-control" @bind="@_name" />
         </td>
     </tr>
 </table>
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Client/Modules/[Owner].[Module]/Settings.razor b/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Client/Modules/[Owner].[Module]/Settings.razor
index 415b24ca..7989d7c9 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Client/Modules/[Owner].[Module]/Settings.razor
+++ b/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Client/Modules/[Owner].[Module]/Settings.razor
@@ -5,10 +5,10 @@
 <table class="table table-borderless">
     <tr>
         <td>
-            <label for="Setting" class="control-label">Setting: </label>
+            <Label For="value" HelpText="Enter a value">Name: </Label>
         </td>
         <td>
-            <input type="text" class="form-control" @bind="_value" />
+            <input id="value" type="text" class="form-control" @bind="@_value" />
         </td>
     </tr>
 </table>