Client Activity selection is not restrictive.

We are allowed to choose activities to be associated with Clients. If we enter the Client before the Activity, we see only activities associated with the Client, However, if we choose the activity before choosing the client, we can choose activities not associated with the client. I'd like to see activities for the client to be restricted to the chosen ones.