diff --git a/PROMS/VEPROMS User Interface/dlgManageSecurity.cs b/PROMS/VEPROMS User Interface/dlgManageSecurity.cs
index dfcb94ce..f3ab5011 100644
--- a/PROMS/VEPROMS User Interface/dlgManageSecurity.cs	
+++ b/PROMS/VEPROMS User Interface/dlgManageSecurity.cs	
@@ -333,6 +333,7 @@ namespace VEPROMS
 			User u = User.MakeUser("[Enter New UserID]", "", "", "", "", "", "", "", "", "", "", DateTime.Now, "");
 			frmManageUser frm = new frmManageUser("add");
 			frm.MyUser = u;
+			frm.Text = "Enter New UserID";   //C2026-002 Change Title bar on Add/Edit User
 			if (frm.ShowDialog(this) == DialogResult.OK)
 			{
 				u = frm.MyUser;
diff --git a/PROMS/VEPROMS User Interface/frmManageUser.cs b/PROMS/VEPROMS User Interface/frmManageUser.cs
index 400d8464..f9ac650e 100644
--- a/PROMS/VEPROMS User Interface/frmManageUser.cs	
+++ b/PROMS/VEPROMS User Interface/frmManageUser.cs	
@@ -20,7 +20,27 @@ namespace VEPROMS
 				_MyUser = value;
 				SimpleUser su = new SimpleUser(_MyUser);
 				pgUser.SelectedObject = su;
-				this.Text = string.Format("{0} ({1} {2}) Information",su.UserID,su.FirstName,su.LastName);
+
+				//C2026-002 Change Title bar on Add/Edit User
+				string tmp;
+                if (!string.IsNullOrEmpty(su.FirstName) && !string.IsNullOrEmpty(su.LastName))
+                {
+                    tmp = $"{su.UserID} ({su.FirstName} {su.LastName}) Information";
+                }
+                else if (!string.IsNullOrEmpty(su.LastName))
+                {
+                    tmp = $"{su.UserID} ({su.LastName}) Information";
+                }
+                else if (!string.IsNullOrEmpty(su.FirstName))
+                {
+                    tmp = $"{su.UserID} ({su.FirstName}) Information";
+                }
+                else
+                {
+                    tmp = $"{su.UserID} Information";
+                }
+
+                this.Text = tmp;
 			}
 		}
 		private string _Mode;