diff --git a/Oqtane.Client/Modules/Admin/Languages/Index.razor b/Oqtane.Client/Modules/Admin/Languages/Index.razor
new file mode 100644
index 00000000..c45a8bc2
--- /dev/null
+++ b/Oqtane.Client/Modules/Admin/Languages/Index.razor
@@ -0,0 +1,54 @@
+@namespace Oqtane.Modules.Admin.Languages
+@inherits ModuleBase
+@inject ILanguageService LanguageService
+@inject IStringLocalizer<Index> Localizer
+
+@if (_languages == null)
+{
+    <p><em>@Localizer["Loading..."]</em></p>
+}
+else
+{
+    <ActionLink Action="Add" Text="Add Language" ResourceKey="AddLanguage" />
+
+    <Pager Items="@_languages">
+        <Header>
+            <th style="width: 1px;">&nbsp;</th>
+            <th>@Localizer["Name"]</th>
+            <th>@Localizer["Code"]</th>
+        </Header>
+        <Row>
+            <td><ActionDialog Header="Delete Langauge" Message="@Localizer["Are You Sure You Wish To Delete The {0} Language?", context.Name]" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteLanguage(context))" Disabled="@(context.IsCurrent)" ResourceKey="DeleteLanguage" /></td>
+            <td>@context.Name</td>
+            <td>@context.Code</td>
+        </Row>
+    </Pager>
+}
+
+@code {
+    private List<Language> _languages;
+
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+
+    protected override async Task OnParametersSetAsync()
+    {
+        _languages = await LanguageService.GetLanguagesAsync(PageState.Site.SiteId);
+    }
+
+    private async Task DeleteLanguage(Language language)
+    {
+        try
+        {
+            await LanguageService.DeleteLanguageAsync(language.LanguageId);
+            await logger.LogInformation("Language Deleted {Language}", language);
+
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Deleting Language {Language} {Error}", language, ex.Message);
+
+            AddModuleMessage(Localizer["Error Deleting Language"], MessageType.Error);
+        }
+    }
+}
diff --git a/Oqtane.Server/Repository/SiteRepository.cs b/Oqtane.Server/Repository/SiteRepository.cs
index d8df82b6..64791442 100644
--- a/Oqtane.Server/Repository/SiteRepository.cs
+++ b/Oqtane.Server/Repository/SiteRepository.cs
@@ -502,6 +502,33 @@ namespace Oqtane.Repository
                 }
             });
             pageTemplates.Add(new PageTemplate
+            {
+                Name = "Language Management",
+                Parent = "Admin",
+                Path = "admin/languages",
+                Icon = Icons.Text,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, RoleNames.Host, true),
+                    new Permission(PermissionNames.Edit, RoleNames.Host, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule
+                    {
+                        ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Languages.Index).ToModuleDefinitionName(), Title = "Language Management", Pane = "Content",
+                        ModulePermissions = new List<Permission>
+                        {
+                            new Permission(PermissionNames.View, RoleNames.Host, true),
+                            new Permission(PermissionNames.Edit, RoleNames.Host, true)
+                        }.EncodePermissions(),
+                        Content = ""
+                    }
+                }
+            });
+            pageTemplates.Add(new PageTemplate
             {
                 Name = "Scheduled Jobs", Parent = "Admin", Path = "admin/jobs", Icon = Icons.Timer, IsNavigation = false, IsPersonalizable = false, 
                 PagePermissions = new List<Permission>
diff --git a/Oqtane.Server/Scripts/Tenant.02.00.02.00.sql b/Oqtane.Server/Scripts/Tenant.02.00.02.00.sql
index 8eb6eef3..a52e8022 100644
--- a/Oqtane.Server/Scripts/Tenant.02.00.02.00.sql
+++ b/Oqtane.Server/Scripts/Tenant.02.00.02.00.sql
@@ -8,6 +8,7 @@ CREATE TABLE [dbo].[Language](
 	[LanguageId] [int] IDENTITY(1,1) NOT NULL,
 	[Name] [nvarchar](100) NOT NULL,
     [Code] [nvarchar](10) NOT NULL,
+    [IsCurrent] [bit] NOT NULL,
     [TenantId] [int],
 	[CreatedBy] [nvarchar](256) NOT NULL,
 	[CreatedOn] [datetime] NOT NULL,