diff --git a/Modules/Applications/AppClassification/app/otbTrainVectorClassifier.cxx b/Modules/Applications/AppClassification/app/otbTrainVectorClassifier.cxx
index 62661a8468ce1514f61d530880deff58dbd45d92..2d867ec80a50322e87bc7bec7805d8def751616f 100644
--- a/Modules/Applications/AppClassification/app/otbTrainVectorClassifier.cxx
+++ b/Modules/Applications/AppClassification/app/otbTrainVectorClassifier.cxx
@@ -64,14 +64,11 @@ private:
   void DoBeforeTrainExecute()
   {
     // Enforce the need of class field name in supervised mode
-    if (GetClassifierCategory() == Supervised)
+    featuresInfo.SetClassFieldNames( GetChoiceNames( "cfield" ), GetSelectedItems( "cfield" ) );
+    
+    if( featuresInfo.m_SelectedCFieldIdx.empty() )
       {
-      featuresInfo.SetClassFieldNames( GetChoiceNames( "cfield" ), GetSelectedItems( "cfield" ) );
-
-      if( featuresInfo.m_SelectedCFieldIdx.empty() )
-        {
-        otbAppLogFATAL( << "No field has been selected for data labelling!" );
-        }
+      otbAppLogFATAL( << "No field has been selected for data labelling!" );
       }
   }