Right-click on the client and choose Lock Return. It's different, but not significantly more time consuming.
