diff --git a/class.jetpack.php b/class.jetpack.php
index facbc23976ee..d210d6d414b9 100644
--- a/class.jetpack.php
+++ b/class.jetpack.php
@@ -602,6 +602,8 @@ private function __construct() {
 		add_action( 'remove_user_from_blog', array( $this, 'unlink_user' ), 10, 1 );
 
 		if ( Jetpack::is_active() ) {
+			add_action( 'login_form_jetpack_json_api_authorization', array( $this, 'login_form_json_api_authorization' ) );
+
 			Jetpack_Heartbeat::init();
 			if ( Jetpack::is_module_active( 'stats' ) && Jetpack::is_module_active( 'search' ) ) {
 				require_once JETPACK__PLUGIN_DIR . '_inc/lib/class.jetpack-search-performance-logger.php';
diff --git a/packages/connection/src/Manager.php b/packages/connection/src/Manager.php
index 8cd0c94aa2d7..19f5ec84f53b 100644
--- a/packages/connection/src/Manager.php
+++ b/packages/connection/src/Manager.php
@@ -73,7 +73,6 @@ public function init() {
 		}
 
 		if ( $this->is_active() ) {
-			add_action( 'login_form_jetpack_json_api_authorization', array( &$this, 'login_form_json_api_authorization' ) );
 			add_filter( 'xmlrpc_methods', array( $this, 'public_xmlrpc_methods' ) );
 		} else {
 			add_action( 'rest_api_init', array( $this, 'initialize_rest_api_registration_connector' ) );