From e0a0497dd21176f354256e4cfabdda2a87a2fdbe Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Tue, 2 Nov 2021 14:49:06 -0400
Subject: [PATCH] Fix #1751 - error when creating site with new tenant

---
 Oqtane.Client/Modules/Admin/Sites/Add.razor         | 13 +++++++------
 .../Resources/Modules/Admin/Sites/Add.resx          |  6 +++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/Sites/Add.razor b/Oqtane.Client/Modules/Admin/Sites/Add.razor
index f369df79..cdcef8da 100644
--- a/Oqtane.Client/Modules/Admin/Sites/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Sites/Add.razor
@@ -147,13 +147,13 @@ else
                     @DatabaseConfigComponent;
                 }
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="hostUsername" HelpText="Enter the username of the host for this site" ResourceKey="HostUsername">Host Username:</Label>
+                    <Label Class="col-sm-3" For="hostUsername" HelpText="Enter the username of an existing host user" ResourceKey="HostUsername">Host Username:</Label>
                     <div class="col-sm-9">
-                        <input id="hostUsername" class="form-control" @bind="@_hostUserName" readonly />
+                        <input id="hostUsername" class="form-control" @bind="@_hostusername" required />
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="hostPassword" HelpText="Enter the password for the host of this site" ResourceKey="HostPassword">Host Password:</Label>
+                    <Label Class="col-sm-3" For="hostPassword" HelpText="Enter the password of an existing host user" ResourceKey="HostPassword">Host Password:</Label>
                     <div class="col-sm-9">
                         <input id="hostPassword" type="password" class="form-control" @bind="@_hostpassword" required />
                     </div>
@@ -186,7 +186,7 @@ else
 
     private string _tenantName = string.Empty;
 
-    private string _hostUserName = UserNames.Host;
+    private string _hostusername = string.Empty;
     private string _hostpassword = string.Empty;
 
     private string _name = string.Empty;
@@ -303,7 +303,7 @@ else
                             // validate host credentials
                             var user = new User();
                             user.SiteId = PageState.Site.SiteId;
-                            user.Username = UserNames.Host;
+                            user.Username = _hostusername;
                             user.Password = _hostpassword;
                             user = await UserService.LoginUserAsync(user, false, false);
                             if (user.IsAuthenticated)
@@ -320,8 +320,9 @@ else
                                     config.TenantName = _tenantName;
                                     config.DatabaseType = database.DBType;
                                     config.ConnectionString = connectionString;
-                                    config.HostEmail = user.Email;
+									config.HostUsername = _hostusername;
                                     config.HostPassword = _hostpassword;
+                                    config.HostEmail = user.Email;
                                     config.HostName = user.DisplayName;
                                     config.IsNewTenant = true;
                                 }
diff --git a/Oqtane.Client/Resources/Modules/Admin/Sites/Add.resx b/Oqtane.Client/Resources/Modules/Admin/Sites/Add.resx
index 6473d0ff..b939b88a 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Sites/Add.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Sites/Add.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -217,10 +217,10 @@
     <value>Enter the password for the integrated security</value>
   </data>
   <data name="HostUsername.HelpText" xml:space="preserve">
-    <value>Enter a valid host username</value>
+    <value>Enter the username of an existing host user</value>
   </data>
   <data name="HostPassword.HelpText" xml:space="preserve">
-    <value>Enter a valid host password</value>
+    <value>Enter the password of an existing host user</value>
   </data>
   <data name="Name.Text" xml:space="preserve">
     <value>Site Name: </value>