Allow clients to specify an ID via PASS or USER - attempt #3

Fixed