diff --git a/PROMS/VEPROMS User Interface/dlgManageSecurity.cs b/PROMS/VEPROMS User Interface/dlgManageSecurity.cs
index 5da9d00c..dfcb94ce 100644
--- a/PROMS/VEPROMS User Interface/dlgManageSecurity.cs	
+++ b/PROMS/VEPROMS User Interface/dlgManageSecurity.cs	
@@ -145,6 +145,9 @@ namespace VEPROMS
             }
 
             LoadRefreshGroupUsers();
+
+			// C2026-004 - messagebox when create group
+			MessageBox.Show($"{txt} group successfully created.", "Create group", MessageBoxButtons.OK, MessageBoxIcon.Information);
 		}
 		private void tvFolders_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e)
 		{
@@ -187,18 +190,22 @@ namespace VEPROMS
 		//Add a Member to a Group
 		private void addMember_Click(object sender, EventArgs e)
 		{
-			int groupIndex = cbGroupSelection.SelectedIndex;
-			string selectedUserID = lstNonMembers.SelectedValue.ToString();
-			int selectedUID = UserInfo.GetByUserID(selectedUserID).UID;
-			GroupInfo gi = myGroupInfoList[groupIndex];
-			User selectedUser = User.Get(selectedUID);
+			// B2026-007 PROMS Security - don't error when add a user to a group but no group selected
+			if (lstNonMembers.SelectedValue != null)
+			{
+				int groupIndex = cbGroupSelection.SelectedIndex;
+				string selectedUserID = lstNonMembers.SelectedValue.ToString();
+				int selectedUID = UserInfo.GetByUserID(selectedUserID).UID;
+				GroupInfo gi = myGroupInfoList[groupIndex];
+				User selectedUser = User.Get(selectedUID);
 
-			Membership.MakeMembership(selectedUser, Group.Get(gi.GID), null, "");
-			updateMembershipLists();
-			lstNonMembers.SelectedIndex = -1;
+				Membership.MakeMembership(selectedUser, Group.Get(gi.GID), null, "");
+				updateMembershipLists();
+				lstNonMembers.SelectedIndex = -1;
 
-			int index = lstMembers.FindString(selectedUserID);
-			lstMembers.SetSelected(index, true);
+				int index = lstMembers.FindString(selectedUserID);
+				lstMembers.SetSelected(index, true);
+			}
 		}
 
 		//Remove a Member From a Group