diff --git a/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor b/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor
index 68d4d13c..6c0f1b0f 100644
--- a/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor
@@ -63,7 +63,7 @@
         </td>
     </tr>
 </table>
-<button class="btn btn-success" @onclick="@SaveModule">Save</button>
+<button type="button" class="btn btn-success" @onclick="@SaveModule">Save</button>
 <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
 
 @code {
diff --git a/Oqtane.Client/Modules/Admin/Pages/Add.razor b/Oqtane.Client/Modules/Admin/Pages/Add.razor
index 1e5868bf..0a719364 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Add.razor
@@ -111,7 +111,7 @@
         </td>
     </tr>
 </table>
-<button class="btn btn-success" @onclick="@SavePage">Save</button>
+<button type="button" class="btn btn-success" @onclick="@SavePage">Save</button>
 <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
 
 @code {
diff --git a/Oqtane.Client/Modules/Admin/Pages/Delete.razor b/Oqtane.Client/Modules/Admin/Pages/Delete.razor
index 0a3cf339..05f8360f 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Delete.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Delete.razor
@@ -111,7 +111,7 @@
         </td>
     </tr>
 </table>
-<button class="btn btn-danger" @onclick="@DeletePage">Delete</button>
+<button type="button" class="btn btn-danger" @onclick="@DeletePage">Delete</button>
 <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
 
 @code {
diff --git a/Oqtane.Client/Modules/Admin/Pages/Edit.razor b/Oqtane.Client/Modules/Admin/Pages/Edit.razor
index 5eadcd24..269695b9 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Edit.razor
@@ -112,7 +112,7 @@
         </td>
     </tr>
 </table>
-<button class="btn btn-success" @onclick="@SavePage">Save</button>
+<button type="button" class="btn btn-success" @onclick="@SavePage">Save</button>
 <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
 
 @code {
diff --git a/Oqtane.Client/Modules/Admin/Sites/Add.razor b/Oqtane.Client/Modules/Admin/Sites/Add.razor
index ff04b471..9db5663c 100644
--- a/Oqtane.Client/Modules/Admin/Sites/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Sites/Add.razor
@@ -55,7 +55,7 @@ else
         </td>
     </tr>
 </table>
-<button class="btn btn-success" @onclick="@SaveSite">Save</button>
+<button type="button" class="btn btn-success" @onclick="@SaveSite">Save</button>
 <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
 }
 
diff --git a/Oqtane.Client/Modules/Counter/Index.razor b/Oqtane.Client/Modules/Counter/Index.razor
index 77dd787d..175aeb38 100644
--- a/Oqtane.Client/Modules/Counter/Index.razor
+++ b/Oqtane.Client/Modules/Counter/Index.razor
@@ -2,7 +2,7 @@
 @inherits ModuleBase
 Current count: @currentCount
 <br />
-<button class="btn btn-primary" @onclick="@IncrementCount">Click me</button>
+<button type="button" class="btn btn-primary" @onclick="@IncrementCount">Click me</button>
 <br /><br />
 
 @code {
diff --git a/Oqtane.Client/Modules/HtmlText/Edit.razor b/Oqtane.Client/Modules/HtmlText/Edit.razor
index 099a9c21..0214db4c 100644
--- a/Oqtane.Client/Modules/HtmlText/Edit.razor
+++ b/Oqtane.Client/Modules/HtmlText/Edit.razor
@@ -20,7 +20,7 @@
             </td>
         </tr>
     </table>
-    <button class="btn btn-success" @onclick="@SaveContent">Save</button>
+    <button type="button" class="btn btn-success" @onclick="@SaveContent">Save</button>
     <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
 </form>
 
diff --git a/Oqtane.Client/Shared/Installer.razor b/Oqtane.Client/Shared/Installer.razor
index 321f8d3d..98aebf80 100644
--- a/Oqtane.Client/Shared/Installer.razor
+++ b/Oqtane.Client/Shared/Installer.razor
@@ -1,113 +1,116 @@
 @using Oqtane.Services
 @using Oqtane.Models
 @inject IUriHelper UriHelper
-@inject IInstallationService  InstallationService
+@inject IInstallationService InstallationService
 @inject IUserService UserService
- 
-<div class="container">
-    <div class="row">
-        <div class="mx-auto text-center">
-            <img src="oqtane.png" />
+
+@if (!Installed)
+{
+    <div class="container">
+        <div class="row">
+            <div class="mx-auto text-center">
+                <img src="oqtane.png" />
+            </div>
+        </div>
+        <hr style="width: 100%; color: gray; height: 1px; background-color:gray;" />
+        <h2 class="text-center">Database Configuration</h2>
+        <div class="row">
+            <div class="mx-auto text-center">
+                <table class="form-group" cellpadding="4" cellspacing="4">
+                    <tbody>
+                        <tr>
+                            <td>
+                                <label for="Title" class="control-label" style="font-weight: bold">Database Type: </label>
+                            </td>
+                            <td>
+                                <select class="custom-select" @bind="@DatabaseType">
+                                    <option value="LocalDB">Local Database</option>
+                                    <option value="SQLServer">SQL Server</option>
+                                </select>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <label for="Title" class="control-label" style="font-weight: bold">Server: </label>
+                            </td>
+                            <td>
+                                <input type="text" id="ServerName" class="form-control" @bind="@ServerName" />
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <label for="Title" class="control-label" style="font-weight: bold">Database: </label>
+                            </td>
+                            <td>
+                                <input type="text" id="DatabaseName" class="form-control" @bind="@DatabaseName" />
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <label for="Title" class="control-label" style="font-weight: bold">Integrated Security: </label>
+                            </td>
+                            <td>
+                                <select class="custom-select" @onchange="@SetIntegratedSecurity">
+                                    <option value="true" selected>True</option>
+                                    <option value="false">False</option>
+                                </select>
+                            </td>
+                        </tr>
+                        <tr style="@IntegratedSecurityDisplay">
+                            <td>
+                                <label for="Title" class="control-label" style="font-weight: bold">Username: </label>
+                            </td>
+                            <td>
+                                <input type="text" id="Username" class="form-control" @bind="@Username" />
+                            </td>
+                        </tr>
+                        <tr style="@IntegratedSecurityDisplay">
+                            <td>
+                                <label for="Title" class="control-label" style="font-weight: bold">Password: </label>
+                            </td>
+                            <td>
+                                <input type="password" id="Password" class="form-control" @bind="@Password" />
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+        <hr style="width: 100%; color: gray; height: 1px; background-color:gray;" />
+        <h2 class="text-center">Application Administrator</h2>
+        <div class="row">
+            <div class="mx-auto text-center">
+                <table class="form-group" cellpadding="4" cellspacing="4">
+                    <tbody>
+                        <tr>
+                            <td>
+                                <label for="Title" class="control-label" style="font-weight: bold">Username: </label>
+                            </td>
+                            <td>
+                                <input type="text" id="Email" class="form-control" @bind="@HostUsername" />
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <label for="Title" class="control-label" style="font-weight: bold">Password: </label>
+                            </td>
+                            <td>
+                                <input type="password" id="Email" class="form-control" @bind="@HostPassword" />
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+        <div class="row">
+            <div class="mx-auto text-center">
+                <button type="button" class="btn btn-success" @onclick="@Install">Install Now</button><br /><br />
+                @((MarkupString)@Message)
+            </div>
+            <div class="loading" style="@LoadingDisplay"></div>
         </div>
     </div>
-    <hr style="width: 100%; color: gray; height: 1px; background-color:gray;" />
-    <h2 class="text-center">Database Configuration</h2>
-    <div class="row">
-        <div class="mx-auto text-center">
-            <table class="form-group" cellpadding="4" cellspacing="4">
-                <tbody>
-                    <tr>
-                        <td>
-                            <label for="Title" class="control-label" style="font-weight: bold">Database Type: </label>
-                        </td>
-                        <td>
-                            <select class="custom-select" @bind="@DatabaseType">
-                                <option value="LocalDB">Local Database</option>
-                                <option value="SQLServer">SQL Server</option>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <label for="Title" class="control-label" style="font-weight: bold">Server: </label>
-                        </td>
-                        <td>
-                            <input type="text" id="ServerName" class="form-control" @bind="@ServerName" />
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <label for="Title" class="control-label" style="font-weight: bold">Database: </label>
-                        </td>
-                        <td>
-                            <input type="text" id="DatabaseName" class="form-control" @bind="@DatabaseName" />
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <label for="Title" class="control-label" style="font-weight: bold">Integrated Security: </label>
-                        </td>
-                        <td>
-                            <select class="custom-select" @onchange="@SetIntegratedSecurity">
-                                <option value="true" selected>True</option>
-                                <option value="false">False</option>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr style="@IntegratedSecurityDisplay">
-                        <td>
-                            <label for="Title" class="control-label" style="font-weight: bold">Username: </label>
-                        </td>
-                        <td>
-                            <input type="text" id="Username" class="form-control" @bind="@Username" />
-                        </td>
-                    </tr>
-                    <tr style="@IntegratedSecurityDisplay">
-                        <td>
-                            <label for="Title" class="control-label" style="font-weight: bold">Password: </label>
-                        </td>
-                        <td>
-                            <input type="password" id="Password" class="form-control" @bind="@Password" />
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-        </div>
-    </div>
-    <hr style="width: 100%; color: gray; height: 1px; background-color:gray;" />
-    <h2 class="text-center">Application Administrator</h2>
-    <div class="row">
-        <div class="mx-auto text-center">
-            <table class="form-group" cellpadding="4" cellspacing="4">
-                <tbody>
-                    <tr>
-                        <td>
-                            <label for="Title" class="control-label" style="font-weight: bold">Username: </label>
-                        </td>
-                        <td>
-                            <input type="text" id="Email" class="form-control" @bind="@HostUsername" />
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <label for="Title" class="control-label" style="font-weight: bold">Password: </label>
-                        </td>
-                        <td>
-                            <input type="password" id="Email" class="form-control" @bind="@HostPassword" />
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-        </div>
-    </div>
-    <div class="row">
-        <div class="mx-auto text-center">
-            <button class="btn btn-success" @onclick="@Install">Install Now</button><br /><br />
-            @((MarkupString)@Message)
-        </div>
-        <div class="loading" style="@LoadingDisplay"></div>
-    </div>
-</div>
+}
 
 @code {
 
@@ -124,6 +127,14 @@ private string Message = "";
 private string IntegratedSecurityDisplay = "display:none;";
 private string LoadingDisplay = "display:none;";
 
+private bool Installed = true;
+
+protected override async Task OnInitAsync()
+{
+    var response = await InstallationService.IsInstalled();
+    Installed = response.Success;
+}
+
 private void SetIntegratedSecurity(UIChangeEventArgs e)
 {
     if (Convert.ToBoolean(e.Value))
diff --git a/Oqtane.Client/Shared/SiteRouter.razor b/Oqtane.Client/Shared/SiteRouter.razor
index cde8bd28..31259eae 100644
--- a/Oqtane.Client/Shared/SiteRouter.razor
+++ b/Oqtane.Client/Shared/SiteRouter.razor
@@ -4,14 +4,12 @@
 @using System.Linq
 @using System.Collections.Generic
 @using Oqtane.Shared
-@using Microsoft.JSInterop
 @using Microsoft.AspNetCore.Components.Routing
 @inject AuthenticationStateProvider AuthenticationStateProvider
 @inject SiteState SiteState
 @inject IUriHelper UriHelper
 @inject INavigationInterception NavigationInterception
 @inject IComponentContext ComponentContext
-@inject IJSRuntime jsRuntime
 @inject IAliasService AliasService
 @inject ITenantService TenantService
 @inject ISiteService SiteService
diff --git a/Oqtane.Client/Themes/Controls/ModuleActions.razor b/Oqtane.Client/Themes/Controls/ModuleActions.razor
index 3f814787..bb60fe73 100644
--- a/Oqtane.Client/Themes/Controls/ModuleActions.razor
+++ b/Oqtane.Client/Themes/Controls/ModuleActions.razor
@@ -7,7 +7,7 @@
 @inject IPageModuleService PageModuleService
 
 <div class="dropdown" style="@display">
-    <button class="btn dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button>
+    <button type="button" class="btn dropdown-toggle" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button>
     <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
         @foreach (var action in actions)
         {