Add password check to the extern calls