In this paper, we review a previous research paper presenting a scheme for quantum key distribution that performs authentication using only quantum means. The authentication mechanism in the protocol runs along with an eavesdropping checking approach. To upgrade security properties, especially against man-in-the-middle attack, we propose a revised and enhanced scheme, so that the probability of detecting eavesdropping is distinctly improved. We use prism tool as a model checker to analyze the security of the quantum system and to emphasize the extent of our contribution. We particularly focus on two security features: (i) the capability of the participants in the protocol to detect any eavesdropping attempt and (ii) any valid knowledge gained on the shared key must be minimized. (C) 2016 John Wiley & Sons, Ltd.