diff --git a/INT69DC_7C/Forms/FormUserEditor.cs b/INT69DC_7C/Forms/FormUserEditor.cs index 6ff80b0..0b018b4 100644 --- a/INT69DC_7C/Forms/FormUserEditor.cs +++ b/INT69DC_7C/Forms/FormUserEditor.cs @@ -134,7 +134,7 @@ namespace INT69DC_7C.Forms this.PasswordChar = false; this.BeforeID = ""; this.BeforePassword = ""; - this.CurrentUserPassword = ""; + this.CurrentUserPassword = "Password12!"; this.UpdateAccessRightComboBoxDisplay(); this.comboBoxAccessRight.SelectedIndexChanged -= new EventHandler(this.comboBoxAccessRight_SelectedIndexChanged); @@ -319,7 +319,10 @@ namespace INT69DC_7C.Forms #endregion item.ID = this.labelID.Text; - item.Password = this.CurrentUserPassword; + if (isNewReg == true) + item.Password = this.SelectedUserItem.ResetPW; + else + item.Password = this.CurrentUserPassword; if (this.ParentForm.SystemConfig.IsOptPart11 == true) { item.ExpireId = int.Parse(this.labelExpiryDateOfAccount.Text); @@ -332,11 +335,15 @@ namespace INT69DC_7C.Forms } //item.IsAdmin = this.cbAdministrator.Checked; - - if (this.SelectedUserItem.Group == DataStore.UserGroup.Admin) - item.ActiveLevel = 9; - else + if (isNewReg == true) item.ActiveLevel = this.comboBoxAccessRight.SelectedIndex + 1; + else + { + if (this.SelectedUserItem.Group == DataStore.UserGroup.Admin) + item.ActiveLevel = 9; + else + item.ActiveLevel = this.comboBoxAccessRight.SelectedIndex + 1; + } menuId.fMenu = new bool[UserManager.USER_MENU_ID_MAX]; for (int i = 0; i < UserManager.USER_MENU_ID_MAX; i++)