diff --git a/module/job/js/edit.js b/module/job/js/edit.js
index 70437e7c94..a319c9dfd5 100644
--- a/module/job/js/edit.js
+++ b/module/job/js/edit.js
@@ -198,7 +198,7 @@ $(document).ready(function()
     $(document).on('change', '#sonarqubeServer', function()
     {
         var sonarqubeID = $(this).val();
-        var projectKey  = sonarqubeID == job.sonarqubeServer ? btoa(job.projectKey) : '';
+        var projectKey  = sonarqubeID == job.sonarqubeServer ? job.projectKey.replace(/-/g, '*') : '';
         $('#sonarProject #projectKey').remove();
         $('#sonarProject #projectKey_chosen').remove();
         $('#sonarProject .input-group').append("<div class='load-indicator loading'></div>");
diff --git a/module/sonarqube/control.php b/module/sonarqube/control.php
index e25e7cbedd..a0e23934b0 100644
--- a/module/sonarqube/control.php
+++ b/module/sonarqube/control.php
@@ -65,7 +65,7 @@ class sonarqube extends control
         $projectPairs = array('' => '');
         foreach($projectList as $project) $projectPairs[$project->key] = $project->name;
 
-        echo html::select('projectKey', $projectPairs, base64_decode($projectKey), "class='form-control chosen'");
+        echo html::select('projectKey', $projectPairs, str_replace('*', '-', $projectKey), "class='form-control chosen'");
     }
     
     /**
diff --git a/module/sonarqube/model.php b/module/sonarqube/model.php
index 926e7e9ca1..fa63d830cd 100644
--- a/module/sonarqube/model.php
+++ b/module/sonarqube/model.php
@@ -90,7 +90,7 @@ class sonarqubeModel extends model
         for($i = 2; $i <= $total; $i++)
         {
             $url          = sprintf($url, 'projects/search?ps=500&p=' . $i);
-            $pageData     = json_decode(commonModel::http($url, null, array(), $header[0]));
+            $pageData     = json_decode(commonModel::http($url, null, array(), $header));
             $projectList += zget($pageData, 'components', array());
         }
         return (array)$projectList;