diff --git a/Oqtane.Client/Modules/Admin/Pages/Add.razor b/Oqtane.Client/Modules/Admin/Pages/Add.razor
index 323f5328..d3f91464 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Add.razor
@@ -134,7 +134,7 @@
                             </div>
                         </div>
                         <div class="row mb-1 align-items-center">
-                            <Label Class="col-sm-3" For="headcontent" HelpText="Optionally enter content to be included in the page head (ie. meta, link, or script tags). Please note that inline script must include an id attribute." ResourceKey="HeadContent">Head Content: </Label>
+                            <Label Class="col-sm-3" For="headcontent" HelpText="Optionally enter content to be included in the page head (ie. meta, link, or script tags)" ResourceKey="HeadContent">Head Content: </Label>
                             <div class="col-sm-9">
                                 <textarea id="headcontent" class="form-control" @bind="@_headcontent" rows="3"></textarea>
                             </div>
diff --git a/Oqtane.Client/Modules/Admin/Pages/Edit.razor b/Oqtane.Client/Modules/Admin/Pages/Edit.razor
index 38c68d94..a0234d93 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Edit.razor
@@ -141,7 +141,7 @@
                             </div>
                         </div>
                         <div class="row mb-1 align-items-center">
-                            <Label Class="col-sm-3" For="headcontent" HelpText="Optionally enter content to be included in the page head (ie. meta, link, or script tags). Please note that inline script must include an id attribute." ResourceKey="HeadContent">Head Content: </Label>
+                            <Label Class="col-sm-3" For="headcontent" HelpText="Optionally enter content to be included in the page head (ie. meta, link, or script tags)" ResourceKey="HeadContent">Head Content: </Label>
                             <div class="col-sm-9">
                                 <textarea id="headcontent" class="form-control" @bind="@_headcontent" rows="3"></textarea>
                             </div>
diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor
index dcf6bdc6..d103a734 100644
--- a/Oqtane.Client/Modules/Admin/Site/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Site/Index.razor
@@ -105,7 +105,7 @@
                 </div>
             </div>
             <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="headcontent" HelpText="Optionally enter content to be included in the page head (ie. meta, link, or script tags). Please note that inline script must include an id attribute." ResourceKey="HeadContent">Head Content: </Label>
+                <Label Class="col-sm-3" For="headcontent" HelpText="Optionally enter content to be included in the page head (ie. meta, link, or script tags)" ResourceKey="HeadContent">Head Content: </Label>
                 <div class="col-sm-9">
                     <textarea id="headcontent" class="form-control" @bind="@_headcontent" rows="3"></textarea>
                 </div>
diff --git a/Oqtane.Client/Resources/Modules/Admin/Pages/Add.resx b/Oqtane.Client/Resources/Modules/Admin/Pages/Add.resx
index b3345f93..5ed5d3e3 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Pages/Add.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Pages/Add.resx
@@ -229,7 +229,7 @@
     <value>Appearance</value>
   </data>
   <data name="HeadContent.HelpText" xml:space="preserve">
-    <value>Optionally enter content to be included in the page head (ie. meta, link, or script tags). Please note that inline script must include an id attribute.</value>
+    <value>Optionally enter content to be included in the page head (ie. meta, link, or script tags)</value>
   </data>
   <data name="HeadContent.Text" xml:space="preserve">
     <value>Head Content:</value>
diff --git a/Oqtane.Client/Resources/Modules/Admin/Pages/Edit.resx b/Oqtane.Client/Resources/Modules/Admin/Pages/Edit.resx
index 3b1cedd4..c8cfca50 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Pages/Edit.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Pages/Edit.resx
@@ -265,7 +265,7 @@
     <value>Clickable?</value>
   </data>
   <data name="HeadContent.HelpText" xml:space="preserve">
-    <value>Optionally enter content to be included in the page head (ie. meta, link, or script tags). Please note that inline script must include an id attribute.</value>
+    <value>Optionally enter content to be included in the page head (ie. meta, link, or script tags)</value>
   </data>
   <data name="HeadContent.Text" xml:space="preserve">
     <value>Head Content:</value>
diff --git a/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx
index cbd72422..24691200 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx
@@ -355,7 +355,7 @@
     <value>Appearance</value>
   </data>
   <data name="HeadContent.HelpText" xml:space="preserve">
-    <value>Optionally enter content to be included in the page head (ie. meta, link, or script tags). Please note that inline script must include an id attribute.</value>
+    <value>Optionally enter content to be included in the page head (ie. meta, link, or script tags)</value>
   </data>
   <data name="HeadContent.Text" xml:space="preserve">
     <value>Head Content:</value>
diff --git a/Oqtane.Client/UI/ThemeBuilder.razor b/Oqtane.Client/UI/ThemeBuilder.razor
index 3c7bfe7b..2bdd8a55 100644
--- a/Oqtane.Client/UI/ThemeBuilder.razor
+++ b/Oqtane.Client/UI/ThemeBuilder.razor
@@ -86,6 +86,7 @@
             if (PageState.Page.HeadContent != null && PageState.Page.HeadContent.Contains("<script"))
             {
                 var interop = new Interop(JSRuntime);
+                var count = 0;
                 var index = PageState.Page.HeadContent.IndexOf("<script");
                 while (index >= 0)
                 {
@@ -128,6 +129,11 @@
                     }
                     else
                     {
+                        if (id == "")
+                        {
+                            count += 1;
+                            id = $"page{PageState.Page.PageId}-script{count}";
+                        }
                         index = script.IndexOf(">") + 1;
                         await interop.IncludeScript(id, "", "", "", script.Substring(index, script.IndexOf("</script>") - index), "head");
                     }
diff --git a/Oqtane.Server/Pages/_Host.cshtml.cs b/Oqtane.Server/Pages/_Host.cshtml.cs
index fef79e52..e1bb5d8c 100644
--- a/Oqtane.Server/Pages/_Host.cshtml.cs
+++ b/Oqtane.Server/Pages/_Host.cshtml.cs
@@ -127,7 +127,7 @@ namespace Oqtane.Pages
                         }
                         if (!string.IsNullOrEmpty(site.HeadContent))
                         {
-                            ProcessHeadContent(site.HeadContent);
+                            ProcessHeadContent(site.HeadContent, "site");
                         }
                         var ThemeType = site.DefaultThemeType;
 
@@ -170,7 +170,7 @@ namespace Oqtane.Pages
                             }
                         }
 
-                        ProcessHeadContent(page.HeadContent);
+                        ProcessHeadContent(page.HeadContent, $"page{page.PageId}");
 
                         // include global resources
                         var assemblies = AppDomain.CurrentDomain.GetOqtaneAssemblies();
@@ -382,15 +382,24 @@ namespace Oqtane.Pages
             }
         }
 
-        private void ProcessHeadContent(string headcontent)
+        private void ProcessHeadContent(string headcontent, string id)
         {
             // iterate scripts
             if (headcontent != null)
             {
+                var count = 0;
                 var index = headcontent.IndexOf("<script");
                 while (index >= 0)
                 {
-                     HeadResources += headcontent.Substring(index, headcontent.IndexOf("</script>", index) + 9 - index) + Environment.NewLine;
+                    var script = headcontent.Substring(index, headcontent.IndexOf("</script>", index) + 9 - index);
+                    if (!script.Contains("src=") && !script.Contains("id="))
+                    {
+                        count += 1;
+                        id += $"-script{count}";
+                        script = script.Replace("<script", $"<script id=\"{id}\"");
+                        index += id.Length;
+                    }
+                    HeadResources += script + Environment.NewLine;
                     index = headcontent.IndexOf("<script", index + 1);
                 }
             }