Emotional-BDI agents are BDI agents whose behaviour is guided not only by beliefs, desires and intentions, but also by the role of emotions in reasoning and decision-making. The EBDI logic is a formal system for expressing the concepts of the Emotional-BDI model of agency. In this paper we present an improved version of the EBDI logic and show how it can be used to model the role of three emotions in Emotional-BDI agents: fear, anxiety and self-confidence. We also focus in the computational properties of EBDI which can lead to its use in automated proof systems.