you answered your question
your solution is to fix the underlying reason why you can't use the logical system that is referenced against the client. If another connection requires it then change it
If the issue is a system user is against the RFC connection then look at switching to trusted systems with own user and assigning each user the required access
Regards
Colleen