client portal duplicate

The client portal asks for clients to 'add new students' when they select 'registering someone else' before giving the option to search the data base to see if the student is already linked to the organisation. This causes duplicates.

The 'add new student' box should only be an option if the student is not in the list and the user clicks 'add new student'. As an admin navigating the client portal it is obvious to me I can exit the first box that appears and see the existing list behind the pop up but to our clients they just see 'add new student' and start typing...