diff --git a/config/ClientsSharedConfig.ts b/config/ClientsSharedConfig.ts
index 97a9958c18954bca6c349f8651eba91ebba9bd7d..c8fe801ff4fd90027248e224acf82a15dddd5ea3 100644
--- a/config/ClientsSharedConfig.ts
+++ b/config/ClientsSharedConfig.ts
@@ -32,9 +32,8 @@ class ClientsSharedConfig {
         }
     };
 
-
     public assignment!: {
-        filename: string, neededFiles: Array<string>
+        filename: string, neededFiles: Array<string>, name: string, secret: string;
     };
 
     public exercise!: {
@@ -121,7 +120,9 @@ class ClientsSharedConfig {
 
         this.assignment = {
             filename   : getEnvVar('ASSIGNMENT_FILENAME', ''),
-            neededFiles: JSON.parse(getEnvVar('EXERCISE_NEEDED_FILES', '[]'))
+            neededFiles: JSON.parse(getEnvVar('EXERCISE_NEEDED_FILES', '[]')),
+            name       : process.env.DOJO_ASSIGNMENT_NAME || '',
+            secret     : process.env.DOJO_ASSIGNMENT_SECRET || ''
         };
 
         this.dockerCompose = {
diff --git a/helpers/Dojo/AssignmentValidator.ts b/helpers/Dojo/AssignmentValidator.ts
index f6e6ed2df5a9c411d6838ebf2a4600c1dc575499..9caa62f22c566a1264074cb71be89713bcab9976 100644
--- a/helpers/Dojo/AssignmentValidator.ts
+++ b/helpers/Dojo/AssignmentValidator.ts
@@ -138,7 +138,7 @@ class AssignmentValidator {
         this.newStep('ASSIGNMENT_CHECKING', 'Please wait while we are checking the assignment...');
 
 
-        const resp = await ClientsSharedAssignmentHelper.getAssignmentByName(this.folderAssignment);
+        const resp = await ClientsSharedAssignmentHelper.getAssignmentByName(ClientsSharedConfig.assignment.name);
         if ( resp == undefined ) {
             this.emitError(`The assignment doesn't exist. An assignment must be created with "assignment create" before checking it.`, `Assignment doesn't exists`, AssignmentCheckerError.ASSIGNMENT_MISSING);
             return;