Emi-Fixed bug 2840 (eApp)