diff --git a/Oqtane.Client/Modules/Admin/Languages/Add.razor b/Oqtane.Client/Modules/Admin/Languages/Add.razor
index cb426201..db6c3813 100644
--- a/Oqtane.Client/Modules/Admin/Languages/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Languages/Add.razor
@@ -133,7 +133,7 @@ else
             <div class="modal-dialog">
                 <div class="modal-content">
                     <div class="modal-header">
-                        <h5 class="modal-title">@Localizer["License Terms"]</h5>
+                        <h5 class="modal-title">@SharedLocalizer["Review License Terms"]</h5>
                         <button type="button" class="btn-close" aria-label="Close" @onclick="HideModal"></button>
                     </div>
                     <div class="modal-body">
@@ -145,13 +145,13 @@ else
                             }
                             else
                             {
-                                @Localizer["License Not Specified"]
+                                @SharedLocalizer["License Not Specified"]
                             }
                         </p>
                     </div>
                     <div class="modal-footer">
-                        <button type="button" class="btn btn-success" @onclick="DownloadPackage">@Localizer["Accept"]</button>
-                        <button type="button" class="btn btn-secondary" @onclick="HideModal">@Localizer["Cancel"]</button>
+                        <button type="button" class="btn btn-success" @onclick="DownloadPackage">@SharedLocalizer["Accept"]</button>
+                        <button type="button" class="btn btn-secondary" @onclick="HideModal">@SharedLocalizer["Cancel"]</button>
                     </div>
                 </div>
             </div>
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
index 3315aebc..ea396c7a 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
@@ -85,7 +85,7 @@
             <div class="modal-dialog">
                 <div class="modal-content">
                     <div class="modal-header">
-                        <h5 class="modal-title">@Localizer["License Terms"]</h5>
+                        <h5 class="modal-title">@SharedLocalizer["Review License Terms"]</h5>
                         <button type="button" class="btn-close" aria-label="Close" @onclick="HideModal"></button>
                     </div>
                     <div class="modal-body">
@@ -97,13 +97,13 @@
                             }
                             else
                             {
-                                @Localizer["License Not Specified"]
+                                @SharedLocalizer["License Not Specified"]
                             }
                         </p>
                     </div>
                     <div class="modal-footer">
-                        <button type="button" class="btn btn-success" @onclick="DownloadPackage">@Localizer["Accept"]</button>
-                        <button type="button" class="btn btn-secondary" @onclick="HideModal">@Localizer["Cancel"]</button>
+                        <button type="button" class="btn btn-success" @onclick="DownloadPackage">@SharedLocalizer["Accept"]</button>
+                        <button type="button" class="btn btn-secondary" @onclick="HideModal">@SharedLocalizer["Cancel"]</button>
                     </div>
                 </div>
             </div>
diff --git a/Oqtane.Client/Modules/Admin/Register/Index.razor b/Oqtane.Client/Modules/Admin/Register/Index.razor
index d30d554e..d33131c2 100644
--- a/Oqtane.Client/Modules/Admin/Register/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Register/Index.razor
@@ -7,16 +7,16 @@
 
 @if (PageState.Site.AllowRegistration)
 {
-    <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
-        <AuthorizeView Roles="@RoleNames.Registered">
-            <Authorizing>
-                <text>...</text>
-            </Authorizing>
-            <Authorized>
-                <ModuleMessage Message="@Localizer["Info.Registration.Exists"]" Type="MessageType.Info" />
-            </Authorized>
-            <NotAuthorized>
-                <ModuleMessage Message="@Localizer["Info.Registration.InvalidEmail"]" Type="MessageType.Info" />
+    <AuthorizeView Roles="@RoleNames.Registered">
+        <Authorizing>
+            <text>...</text>
+        </Authorizing>
+        <Authorized>
+            <ModuleMessage Message="@Localizer["Info.Registration.Exists"]" Type="MessageType.Info" />
+        </Authorized>
+        <NotAuthorized>
+            <ModuleMessage Message="@Localizer["Info.Registration.InvalidEmail"]" Type="MessageType.Info" />
+            <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
                 <div class="container">
                     <div class="row mb-1 align-items-center">
                         <Label Class="col-sm-3" For="username" HelpText="Your username. Note that this field can not be modified once it is saved." ResourceKey="Username"></Label>
@@ -25,13 +25,13 @@
                         </div>
                     </div>
                     <div class="row mb-1 align-items-center">
-                        <Label Class="col-sm-3" For="password" HelpText="If you wish to change your password you can enter it here. Please choose a sufficiently secure password." ResourceKey="Password"></Label>
+                        <Label Class="col-sm-3" For="password" HelpText="Please choose a sufficiently secure password and enter it here" ResourceKey="Password"></Label>
                         <div class="col-sm-9">
                             <input id="password" type="password" class="form-control" @bind="@_password" autocomplete="new-password" required />
                         </div>
                     </div>
                     <div class="row mb-1 align-items-center">
-                        <Label Class="col-sm-3" For="confirm" HelpText="If you are changing your password you must enter it again to confirm it matches" ResourceKey="Confirm"></Label>
+                        <Label Class="col-sm-3" For="confirm" HelpText="Enter your password again to confirm it matches the value entered above" ResourceKey="Confirm"></Label>
                         <div class="col-sm-9">
                             <input id="confirm" type="password" class="form-control" @bind="@_confirm" autocomplete="new-password" required />
                         </div>
@@ -45,16 +45,16 @@
                     <div class="row mb-1 align-items-center">
                         <Label Class="col-sm-3" For="displayname" HelpText="Your full name" ResourceKey="DisplayName"></Label>
                         <div class="col-sm-9">
-                            <input id="displayname" class="form-control" @bind="@_displayname" maxlength="50" required />
+                            <input id="displayname" class="form-control" @bind="@_displayname" maxlength="50" />
                         </div>
                     </div>
                 </div>
                 <br />
                 <button type="button" class="btn btn-primary" @onclick="Register">@Localizer["Register"]</button>
                 <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
-            </NotAuthorized>
-        </AuthorizeView>
-    </form>
+            </form>
+        </NotAuthorized>
+    </AuthorizeView>
 }
 else
 {
@@ -82,7 +82,7 @@ else
             {
                 bool _isEmailValid = Utilities.IsValidEmail(_email);
 
-                if (_username != "" && _password != "" && _confirm != "" && _isEmailValid)
+                if (_isEmailValid)
                 {
                     if (_password == _confirm)
                     {
diff --git a/Oqtane.Client/Modules/Admin/Themes/Add.razor b/Oqtane.Client/Modules/Admin/Themes/Add.razor
index dcfaea37..9b7bd6b2 100644
--- a/Oqtane.Client/Modules/Admin/Themes/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Themes/Add.razor
@@ -86,7 +86,7 @@
             <div class="modal-dialog">
                 <div class="modal-content">
                     <div class="modal-header">
-                        <h5 class="modal-title">@Localizer["License Terms"]</h5>
+                        <h5 class="modal-title">@SharedLocalizer["Review License Terms"]</h5>
                         <button type="button" class="btn-close" aria-label="Close" @onclick="HideModal"></button>
                     </div>
                     <div class="modal-body">
@@ -98,13 +98,13 @@
                             }
                             else
                             {
-                                @Localizer["License Not Specified"]
+                                @SharedLocalizer["License Not Specified"]
                             }
                         </p>
                     </div>
                     <div class="modal-footer">
-                        <button type="button" class="btn btn-success" @onclick="DownloadPackage">@Localizer["Accept"]</button>
-                        <button type="button" class="btn btn-secondary" @onclick="HideModal">@Localizer["Cancel"]</button>
+                        <button type="button" class="btn btn-success" @onclick="DownloadPackage">@SharedLocalizer["Accept"]</button>
+                        <button type="button" class="btn btn-secondary" @onclick="HideModal">@SharedLocalizer["Cancel"]</button>
                     </div>
                 </div>
             </div>
diff --git a/Oqtane.Client/Resources/Modules/Admin/Register/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Register/Index.resx
index 9c99dcf2..4ce1b471 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Register/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Register/Index.resx
@@ -148,7 +148,7 @@
     <value>Error Adding User</value>
   </data>
   <data name="Confirm.HelpText" xml:space="preserve">
-    <value>If you are changing your password you must enter it again to confirm it matches</value>
+    <value>Enter your password again to confirm it matches the value entered above</value>
   </data>
   <data name="Confirm.Text" xml:space="preserve">
     <value>Confirm Password:</value>
@@ -166,7 +166,7 @@
     <value>Email:</value>
   </data>
   <data name="Password.HelpText" xml:space="preserve">
-    <value>If you wish to change your password you can enter it here. Please choose a sufficiently secure password.</value>
+    <value>Please choose a sufficiently secure password and enter it here</value>
   </data>
   <data name="Password.Text" xml:space="preserve">
     <value>Password:</value>
diff --git a/Oqtane.Client/Resources/SharedResources.resx b/Oqtane.Client/Resources/SharedResources.resx
index 5eee0691..9ef78435 100644
--- a/Oqtane.Client/Resources/SharedResources.resx
+++ b/Oqtane.Client/Resources/SharedResources.resx
@@ -291,4 +291,13 @@
   <data name="Search.Price" xml:space="preserve">
     <value>price</value>
   </data>
+  <data name="Accept" xml:space="preserve">
+    <value>Accept</value>
+  </data>
+  <data name="License Not Specified" xml:space="preserve">
+    <value>License Not Specified</value>
+  </data>
+  <data name="Review License Terms" xml:space="preserve">
+    <value>Review License Terms</value>
+  </data>
 </root>
\ No newline at end of file