Handle nicely the SSL gateway broker

cc @regilero @jpcw