* commit 'b7f482ab41f3c50d2765c53db8b4e79f4e1b7903': Only call authenticate when we are not listening yet