diff --git a/Jenkinsfile b/Jenkinsfile
index aba2732f56e5629c8e0a0a3685da96a7bfd6353a..fbdbad8fdedee6e41770d77c4e2b0b1847f713fb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -27,7 +27,7 @@ pipeline {
                         ],
                         submoduleCfg: [],
                         userRemoteConfigs: [[
-                        credentialsId: '731ae722-2828-45b8-83f4-ae59fe1cae50', 
+                        credentialsId: 'Jenkins', 
                         url: "${env.gitlabSourceRepoSshUrl}" ]]
                     ]
                     sh 'git log --oneline -n 5'
@@ -39,7 +39,7 @@ pipeline {
                         $class: 'GitSCM', branches: [[name: '*/master']], 
                         doGenerateSubmoduleConfigurations: false, extensions: [], 
                         submoduleCfg: [], userRemoteConfigs: [[
-                        credentialsId: '731ae722-2828-45b8-83f4-ae59fe1cae50', 
+                        credentialsId: 'Jenkins', 
                         url: 'git@forge.3gpp.org:tools/3gpp-scripts.git']]
                     ]
                 }
@@ -76,16 +76,18 @@ pipeline {
                 )}"""
             }
 
-            updateGitlabCommitStatus name: 'Validate', state: 'failed'
             mail to: 'cti_support@etsi.org',
                 subject: "Failed Pipeline: ${currentBuild.fullDisplayName}",
                 body: "Something is wrong with ${env.BUILD_URL}"
+            echo "Sending email to: ${RECIPIENT}" 
             mail to: "${RECIPIENT}",
-                subject: "[3GPP Forge] Validaiton failed: ${currentBuild.fullDisplayName}",
+                subject: "[3GPP Forge] Validation failed: ${currentBuild.fullDisplayName}",
                 body: "Your contribution to 3GPP Forge was applied successfully; however, " +
                     "after running the validation process for all the files in the repository," +
                     "some errors were detected (they may, or may not be related to your own " +
                     "contribution). Please check the 'Console output' at ${env.BUILD_URL}"
+            
+            updateGitlabCommitStatus name: 'Validate', state: 'failed'
         }
     }
 }