diff --git a/src/client/Client.js b/src/client/Client.js
index 416e973..9941b78 100644
--- a/src/client/Client.js
+++ b/src/client/Client.js
@@ -507,8 +507,6 @@ module.exports = Class( 'Client' )
 
             client._monitorQuote( client._quote );
 
-            client._cmatch.hookClassifier( client._dataValidator );
-
             // store internal status
             client._isInternal = client.program.isInternal =
                 ( data.content.internal )
@@ -528,6 +526,8 @@ module.exports = Class( 'Client' )
                 client.program.initQuote( bucket );
             } );
 
+            client._cmatch.hookClassifier( client._dataValidator );
+
             client.ui.setQuote( client._quote, client.program, clear_step );
 
             // if logged in internally, show internal questions and do other