manager: improved ESource/EClient connection flow