added support for MEL in client id