diff --git a/INT69DC_7C/Controls/ControlUserSetting.cs b/INT69DC_7C/Controls/ControlUserSetting.cs
index caa7d5b..2ea8c7a 100644
--- a/INT69DC_7C/Controls/ControlUserSetting.cs
+++ b/INT69DC_7C/Controls/ControlUserSetting.cs
@@ -103,8 +103,8 @@ namespace INT69DC_7C.Controls
 
             this.labelID.Text = item.ID;
             this.labelPassword.Text = item.Password;
-            this.labelExpireAccountDate.Text = string.Format("{0:yyyy/MM/dd} ~ {1:yyyy/MM/dd}", item.DatePasswordLogin, item.DateIdExpire);
-            this.labelExpirePasswordDate.Text = string.Format("{0:yyyy/MM/dd} ~ {1:yyyy/MM/dd}", item.DateIdRegister, item.DatePasswordExpire);
+            this.labelExpireAccountDate.Text = string.Format("{0:yyyy/MM/dd} ~ {1:yyyy/MM/dd}", item.DateIdLogin, item.DateIdExpire);
+            this.labelExpirePasswordDate.Text = string.Format("{0:yyyy/MM/dd} ~ {1:yyyy/MM/dd}", item.DatePasswordRegister, item.DatePasswordExpire);
             this.labelStatusExpireAccount.Visible = item.IsLockAccount;
             this.labelStatusExpirePassword.Visible = item.IsLockPassword;
         }
diff --git a/INT69DC_7C/DialogForms/DialogFormLogOn.cs b/INT69DC_7C/DialogForms/DialogFormLogOn.cs
index c95f11a..f2b5733 100644
--- a/INT69DC_7C/DialogForms/DialogFormLogOn.cs
+++ b/INT69DC_7C/DialogForms/DialogFormLogOn.cs
@@ -167,10 +167,10 @@ namespace INT69DC_7C.DialogForms
                 this.ParentForm.SystemConfig.CurrentUser.ExpireId = userInfo.id_expire_period;
                 this.ParentForm.SystemConfig.CurrentUser.ExpirePassword = userInfo.password_expire_period;
 
-                DateTime time = DateTime.ParseExact(userInfo.password_login_date.GetDateTime(), "yyyyMMddHHmmss", null);
-                this.ParentForm.SystemConfig.CurrentUser.DatePasswordLogin = time;
-                time = DateTime.ParseExact(userInfo.id_register_date.GetDateTime(), "yyyyMMddHHmmss", null);
-                this.ParentForm.SystemConfig.CurrentUser.DateIdRegister = time;
+                DateTime time = DateTime.ParseExact(userInfo.password_register_date.GetDateTime(), "yyyyMMddHHmmss", null);
+                this.ParentForm.SystemConfig.CurrentUser.DatePasswordRegister = time;
+                time = DateTime.ParseExact(userInfo.id_login_date.GetDateTime(), "yyyyMMddHHmmss", null);
+                this.ParentForm.SystemConfig.CurrentUser.DateIdLogin = time;
                 time = DateTime.ParseExact(userInfo.id_expire_date.GetDateTime(), "yyyyMMddHHmmss", null);
                 this.ParentForm.SystemConfig.CurrentUser.DateIdExpire = time;
                 time = DateTime.ParseExact(userInfo.password_expire_date.GetDateTime(), "yyyyMMddHHmmss", null);
@@ -274,10 +274,10 @@ namespace INT69DC_7C.DialogForms
                     this.ParentForm.SystemConfig.CurrentUser.ExpireId = userInfo.id_expire_period;
                     this.ParentForm.SystemConfig.CurrentUser.ExpirePassword = userInfo.password_expire_period;
 
-                    DateTime time = DateTime.ParseExact(userInfo.password_login_date.GetDateTime(), "yyyyMMddHHmmss", null);
-                    this.ParentForm.SystemConfig.CurrentUser.DatePasswordLogin = time;
-                    time = DateTime.ParseExact(userInfo.id_register_date.GetDateTime(), "yyyyMMddHHmmss", null);
-                    this.ParentForm.SystemConfig.CurrentUser.DateIdRegister = time;
+                    DateTime time = DateTime.ParseExact(userInfo.password_register_date.GetDateTime(), "yyyyMMddHHmmss", null);
+                    this.ParentForm.SystemConfig.CurrentUser.DatePasswordRegister = time;
+                    time = DateTime.ParseExact(userInfo.id_login_date.GetDateTime(), "yyyyMMddHHmmss", null);
+                    this.ParentForm.SystemConfig.CurrentUser.DateIdLogin = time;
                     time = DateTime.ParseExact(userInfo.id_expire_date.GetDateTime(), "yyyyMMddHHmmss", null);
                     this.ParentForm.SystemConfig.CurrentUser.DateIdExpire = time;
                     time = DateTime.ParseExact(userInfo.password_expire_date.GetDateTime(), "yyyyMMddHHmmss", null);
diff --git a/INT69DC_7C/DialogForms/DialogFormLogOn1.cs b/INT69DC_7C/DialogForms/DialogFormLogOn1.cs
index 05916ea..3b1f5eb 100644
--- a/INT69DC_7C/DialogForms/DialogFormLogOn1.cs
+++ b/INT69DC_7C/DialogForms/DialogFormLogOn1.cs
@@ -248,13 +248,13 @@ namespace INT69DC_7C.DialogForms
             this.ParentForm.SystemConfig.CurrentUser.ExpirePassword = user.password_expire_period;
 
             // console
-            Console.WriteLine(user.password_login_date.GetDateTime());
-            DateTime time = DateTime.ParseExact(user.password_login_date.GetDateTime(), "yyyyMMddHHmmss", null);
-            this.ParentForm.SystemConfig.CurrentUser.DatePasswordLogin = time;
+            Console.WriteLine(user.password_register_date.GetDateTime());
+            DateTime time = DateTime.ParseExact(user.password_register_date.GetDateTime(), "yyyyMMddHHmmss", null);
+            this.ParentForm.SystemConfig.CurrentUser.DatePasswordRegister = time;
             // console
-            Console.WriteLine(user.id_register_date.GetDateTime());
-            time = DateTime.ParseExact(user.id_register_date.GetDateTime(), "yyyyMMddHHmmss", null);
-            this.ParentForm.SystemConfig.CurrentUser.DateIdRegister = time;
+            Console.WriteLine(user.id_login_date.GetDateTime());
+            time = DateTime.ParseExact(user.id_login_date.GetDateTime(), "yyyyMMddHHmmss", null);
+            this.ParentForm.SystemConfig.CurrentUser.DateIdLogin = time;
 
             if (this.ParentForm.SystemConfig.CurrentUser.Group == DataStore.UserGroup.Admin
                 || this.ParentForm.SystemConfig.CurrentUser.Group == DataStore.UserGroup.Developer)
diff --git a/INT69DC_7C/Forms/FormMainDisplay.cs b/INT69DC_7C/Forms/FormMainDisplay.cs
index d489601..56054c5 100644
--- a/INT69DC_7C/Forms/FormMainDisplay.cs
+++ b/INT69DC_7C/Forms/FormMainDisplay.cs
@@ -959,15 +959,15 @@ namespace INT69DC_7C.Forms
                 this.ParentForm.SystemConfig.CurrentUser.ExpireId = userInfo.id_expire_period;
                 this.ParentForm.SystemConfig.CurrentUser.ExpirePassword = userInfo.password_expire_period;
 
-                Console.WriteLine(userInfo.password_login_date.GetDateTime());
-                Console.WriteLine(userInfo.id_register_date.GetDateTime());
+                Console.WriteLine(userInfo.password_register_date.GetDateTime());
+                Console.WriteLine(userInfo.id_login_date.GetDateTime());
                 Console.WriteLine(userInfo.id_expire_date.GetDateTime());
                 Console.WriteLine(userInfo.password_expire_date.GetDateTime());
 
-                DateTime time = DateTime.ParseExact(userInfo.password_login_date.GetDateTime(), "yyyyMMddHHmmss", null);
-                this.ParentForm.SystemConfig.CurrentUser.DatePasswordLogin = time;
-                time = DateTime.ParseExact(userInfo.id_register_date.GetDateTime(), "yyyyMMddHHmmss", null);
-                this.ParentForm.SystemConfig.CurrentUser.DateIdRegister = time;
+                DateTime time = DateTime.ParseExact(userInfo.password_register_date.GetDateTime(), "yyyyMMddHHmmss", null);
+                this.ParentForm.SystemConfig.CurrentUser.DatePasswordRegister = time;
+                time = DateTime.ParseExact(userInfo.id_login_date.GetDateTime(), "yyyyMMddHHmmss", null);
+                this.ParentForm.SystemConfig.CurrentUser.DateIdLogin = time;
                 time = DateTime.ParseExact(userInfo.id_expire_date.GetDateTime(), "yyyyMMddHHmmss", null);
                 this.ParentForm.SystemConfig.CurrentUser.DateIdExpire = time;
                 time = DateTime.ParseExact(userInfo.password_expire_date.GetDateTime(), "yyyyMMddHHmmss", null);
@@ -2418,10 +2418,10 @@ namespace INT69DC_7C.Forms
                     this.ParentForm.SystemConfig.CurrentUser.ExpireId = userInfo.id_expire_period;
                     this.ParentForm.SystemConfig.CurrentUser.ExpirePassword = userInfo.password_expire_period;
 
-                    DateTime time = DateTime.ParseExact(userInfo.password_login_date.GetDateTime(), "yyyyMMddHHmmss", null);
-                    this.ParentForm.SystemConfig.CurrentUser.DatePasswordLogin = time;
-                    time = DateTime.ParseExact(userInfo.id_register_date.GetDateTime(), "yyyyMMddHHmmss", null);
-                    this.ParentForm.SystemConfig.CurrentUser.DateIdRegister = time;
+                    DateTime time = DateTime.ParseExact(userInfo.password_register_date.GetDateTime(), "yyyyMMddHHmmss", null);
+                    this.ParentForm.SystemConfig.CurrentUser.DatePasswordRegister = time;
+                    time = DateTime.ParseExact(userInfo.id_login_date.GetDateTime(), "yyyyMMddHHmmss", null);
+                    this.ParentForm.SystemConfig.CurrentUser.DateIdLogin = time;
                     time = DateTime.ParseExact(userInfo.id_expire_date.GetDateTime(), "yyyyMMddHHmmss", null);
                     this.ParentForm.SystemConfig.CurrentUser.DateIdExpire = time;
                     time = DateTime.ParseExact(userInfo.password_expire_date.GetDateTime(), "yyyyMMddHHmmss", null);
diff --git a/INT69DC_7C/Forms/FormUserEditor.cs b/INT69DC_7C/Forms/FormUserEditor.cs
index a69639e..0353b2a 100644
--- a/INT69DC_7C/Forms/FormUserEditor.cs
+++ b/INT69DC_7C/Forms/FormUserEditor.cs
@@ -535,22 +535,22 @@ namespace INT69DC_7C.Forms
             if (this.SelectedUserItem.Group == DataStore.UserGroup.Admin
                   || this.SelectedUserItem.Group == DataStore.UserGroup.Developer)
             {
-                Console.WriteLine(item.password_login_date.GetDateTime());
-                Console.WriteLine(item.id_register_date.GetDateTime());
+                Console.WriteLine(item.password_register_date.GetDateTime());
+                Console.WriteLine(item.id_login_date.GetDateTime());
                 Console.WriteLine(item.id_expire_date.GetDateTime());
                 Console.WriteLine(item.password_expire_date.GetDateTime());
 
-                this.SelectedUserItem.DatePasswordLogin = DateTime.Now;
-                this.SelectedUserItem.DateIdRegister = DateTime.Now;
+                this.SelectedUserItem.DatePasswordRegister = DateTime.Now;
+                this.SelectedUserItem.DateIdLogin = DateTime.Now;
                 this.SelectedUserItem.DateIdExpire = DateTime.Now;
                 this.SelectedUserItem.DatePasswordExpire = DateTime.Now;
             }
             else
             {
-                DateTime time = DateTime.ParseExact(item.password_login_date.GetDateTime(), "yyyyMMddHHmmss", null);
-                this.SelectedUserItem.DatePasswordLogin = time;
-                time = DateTime.ParseExact(item.id_register_date.GetDateTime(), "yyyyMMddHHmmss", null);
-                this.SelectedUserItem.DateIdRegister = time;
+                DateTime time = DateTime.ParseExact(item.password_register_date.GetDateTime(), "yyyyMMddHHmmss", null);
+                this.SelectedUserItem.DatePasswordRegister = time;
+                time = DateTime.ParseExact(item.id_login_date.GetDateTime(), "yyyyMMddHHmmss", null);
+                this.SelectedUserItem.DateIdLogin = time;
                 time = DateTime.ParseExact(item.id_expire_date.GetDateTime(), "yyyyMMddHHmmss", null);
                 this.SelectedUserItem.DateIdExpire = time;
                 time = DateTime.ParseExact(item.password_expire_date.GetDateTime(), "yyyyMMddHHmmss", null);
@@ -586,23 +586,23 @@ namespace INT69DC_7C.Forms
             if (this.SelectedUserItem.Group == DataStore.UserGroup.Admin
                   || this.SelectedUserItem.Group == DataStore.UserGroup.Developer)
             {
-                Console.WriteLine(item.password_login_date.GetDateTime());
-                Console.WriteLine(item.id_register_date.GetDateTime());
+                Console.WriteLine(item.password_register_date.GetDateTime());
+                Console.WriteLine(item.id_login_date.GetDateTime());
                 Console.WriteLine(item.id_expire_date.GetDateTime());
                 Console.WriteLine(item.password_expire_date.GetDateTime());
 
 
-                this.SelectedUserItem.DatePasswordLogin = DateTime.Now;
-                this.SelectedUserItem.DateIdRegister = DateTime.Now;
+                this.SelectedUserItem.DatePasswordRegister = DateTime.Now;
+                this.SelectedUserItem.DateIdLogin = DateTime.Now;
                 this.SelectedUserItem.DateIdExpire = DateTime.Now;
                 this.SelectedUserItem.DatePasswordExpire = DateTime.Now;
             }
             else
             {
-                DateTime time = DateTime.ParseExact(item.password_login_date.GetDateTime(), "yyyyMMddHHmmss", null);
-                this.SelectedUserItem.DatePasswordLogin = time;
-                time = DateTime.ParseExact(item.id_register_date.GetDateTime(), "yyyyMMddHHmmss", null);
-                this.SelectedUserItem.DateIdRegister = time;
+                DateTime time = DateTime.ParseExact(item.password_register_date.GetDateTime(), "yyyyMMddHHmmss", null);
+                this.SelectedUserItem.DatePasswordRegister = time;
+                time = DateTime.ParseExact(item.id_login_date.GetDateTime(), "yyyyMMddHHmmss", null);
+                this.SelectedUserItem.DateIdLogin = time;
                 time = DateTime.ParseExact(item.id_expire_date.GetDateTime(), "yyyyMMddHHmmss", null);
                 this.SelectedUserItem.DateIdExpire = time;
                 time = DateTime.ParseExact(item.password_expire_date.GetDateTime(), "yyyyMMddHHmmss", null);
@@ -648,8 +648,8 @@ namespace INT69DC_7C.Forms
             {
                 this.labelExpiryDateOfAccount.Text = item.ExpireId.ToString();
                 this.labelExpiryDateOfPassword.Text = item.ExpirePassword.ToString();
-                this.labelExpiryDateOfAccount2.Text = string.Format("{0:yyyy/MM/dd} ~ {1:yyyy/MM/dd}", item.DateIdRegister, item.DateIdExpire);
-                this.labelExpiryDateOfPassword2.Text = string.Format("{0:yyyy/MM/dd} ~ {1:yyyy/MM/dd}", item.DatePasswordLogin, item.DatePasswordExpire);
+                this.labelExpiryDateOfAccount2.Text = string.Format("{0:yyyy/MM/dd} ~ {1:yyyy/MM/dd}", item.DateIdLogin, item.DateIdExpire);
+                this.labelExpiryDateOfPassword2.Text = string.Format("{0:yyyy/MM/dd} ~ {1:yyyy/MM/dd}", item.DatePasswordRegister, item.DatePasswordExpire);
 
                 this.labelStatusExpiryAccount.Visible = item.IsLockAccount;
                 this.labelStatusExpiryPassword.Visible = item.IsLockPassword;
diff --git a/INT69DC_7C/Part11_UserManager/UserItem.cs b/INT69DC_7C/Part11_UserManager/UserItem.cs
index ad4807d..7a57ae9 100644
--- a/INT69DC_7C/Part11_UserManager/UserItem.cs
+++ b/INT69DC_7C/Part11_UserManager/UserItem.cs
@@ -19,8 +19,8 @@ namespace INT69DC_7C.Part11_UserManager
         private bool m_IsLockAccount;
         private bool m_IsLockPassword;
 
-        private DateTime m_DatePasswordLogin;
-        private DateTime m_DateIdRegister;
+        private DateTime m_DatePasswordRegister;
+        private DateTime m_DateIdLogin;
         private DateTime m_DateIdExpire;
         private DateTime m_DatePasswordExpire;
 
@@ -72,15 +72,15 @@ namespace INT69DC_7C.Part11_UserManager
             set { this.m_IsLockPassword = value; }
         }
 
-        public DateTime DatePasswordLogin
+        public DateTime DatePasswordRegister
         {
-            get { return this.m_DatePasswordLogin; }
-            set { this.m_DatePasswordLogin = value; }
+            get { return this.m_DatePasswordRegister; }
+            set { this.m_DatePasswordRegister = value; }
         }
-        public DateTime DateIdRegister
+        public DateTime DateIdLogin
         {
-            get { return this.m_DateIdRegister; }
-            set { this.m_DateIdRegister = value; }
+            get { return this.m_DateIdLogin; }
+            set { this.m_DateIdLogin = value; }
         }
         public DateTime DateIdExpire
         {
@@ -121,8 +121,8 @@ namespace INT69DC_7C.Part11_UserManager
             this.ExpireId = 0;
             this.ExpirePassword = 0;
 
-            this.DatePasswordLogin = DateTime.Now;
-            this.DateIdRegister = DateTime.Now;
+            this.DatePasswordRegister = DateTime.Now;
+            this.DateIdLogin = DateTime.Now;
             this.DateIdExpire = DateTime.Now;
             this.DatePasswordExpire = DateTime.Now;
 
diff --git a/INT69DC_7C/Part11_UserManager/UserManager.Structure.cs b/INT69DC_7C/Part11_UserManager/UserManager.Structure.cs
index cf9c829..1bd7931 100644
--- a/INT69DC_7C/Part11_UserManager/UserManager.Structure.cs
+++ b/INT69DC_7C/Part11_UserManager/UserManager.Structure.cs
@@ -224,10 +224,10 @@ namespace INT69DC_7C.Part11_UserManager
             public Int32 password_flock_status;			// password lock status			(need to change password)
 
             [MarshalAs(UnmanagedType.Struct)]
-            public DateTime_t password_login_date;			// date/time when the user password was registered or changed
+            public DateTime_t password_register_date;			// date/time when the user password was registered or changed
 
             [MarshalAs(UnmanagedType.Struct)]
-            public DateTime_t id_register_date;				// date/time when the user was login   
+            public DateTime_t id_login_date;				// date/time when the user was login   
 
             [MarshalAs(UnmanagedType.Struct)]
             public DateTime_t password_expire_date;     // Password Expiration Date
@@ -339,10 +339,10 @@ namespace INT69DC_7C.Part11_UserManager
             public Int32 flock_status_password;			// password lock			(need to change password)
 
             [MarshalAs(UnmanagedType.Struct)]
-            public DateTime_t password_login_date;			// date/time when the user password was registered or changed
+            public DateTime_t password_register_date;			// date/time when the user password was registered or changed
 
             [MarshalAs(UnmanagedType.Struct)]
-            public DateTime_t id_register_date;				// date/time when the user was login  
+            public DateTime_t id_login_date;				// date/time when the user was login  
 
             [MarshalAs(UnmanagedType.Struct)]
             public DateTime_t password_expire_date;     // Password Expiration Date