diff --git a/admin/static/js/app.js b/admin/static/js/app.js
index 83f356d0..0039770e 100644
--- a/admin/static/js/app.js
+++ b/admin/static/js/app.js
@@ -564,6 +564,18 @@ angular.module("FICApp")
 	})
 
 	.controller("AllTeamAssociationsController", function ($scope, $http) {
+		$scope.newdqa = "";
+		$scope.addDelegatedQA = function () {
+			if ($scope.newdqa.length) {
+				if (!$scope.config.delegated_qa)
+					$scope.config.delegated_qa = [];
+
+				$scope.config.delegated_qa.push($scope.newdqa);
+				$scope.saveSettings();
+				$scope.newdqa = "";
+			}
+		}
+
 		$scope.allAssociations = [];
 		$http.get("api/teams-associations.json").then(function (response) {
 			$scope.allAssociations = response.data;
@@ -625,17 +637,6 @@ angular.module("FICApp")
 				$scope.config.disablesubmitbutton = "";
 		};
 
-		$scope.newdqa = "";
-		$scope.addDelegatedQA = function () {
-			if ($scope.newdqa.length) {
-				if (!$scope.config.delegated_qa)
-					$scope.config.delegated_qa = [];
-
-				$scope.config.delegated_qa.push($scope.newdqa);
-				$scope.saveSettings();
-				$scope.newdqa = "";
-			}
-		}
 		$scope.dropDelegatedQA = function (member) {
 			if (!$scope.config.delegated_qa) {
 				$scope.config.delegated_qa = [];
diff --git a/admin/static/views/settings.html b/admin/static/views/settings.html
index 72474aab..58035170 100644
--- a/admin/static/views/settings.html
+++ b/admin/static/views/settings.html
@@ -306,7 +306,7 @@
     </div>
    </form>
 
-  <form ng-submit="addDelegatedQA()" class="card my-3">
+  <div class="card my-3">
     <div class="card-header">
       <h3>Managers QA</h3>
     </div>
@@ -318,22 +318,23 @@
 	    <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
 	  </button>
 	</li>
-	<li class="row">
-	  <div class="col" ng-controller="AllTeamAssociationsController">
-            <select class="form-control form-control-sm" ng-model="newdqa">
-              <option ng-repeat="(i,m) in allAssociations" ng-value="m">{{ m }}</option>
-            </select>
-	  </div>
-	  <div class="col input-group">
-	    <input type="text" class="form-control form-control-sm" ng-model="newdqa" placeholder="Nouveau manager QA">
-	    <span class="input-group-append">
-	      <button class="btn btn-sm btn-success" ng-disabled="!newdqa.length"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span></button>
-	    </span>
-	  </div>
-	</li>
       </ul>
+
+      <form class="row" ng-controller="AllTeamAssociationsController" ng-submit="addDelegatedQA()">
+	<div class="col">
+          <select class="form-control form-control-sm" ng-model="newdqa">
+            <option ng-selected="newdqa == m" ng-repeat="(i,m) in allAssociations" ng-value="m">{{ m }}</option>
+          </select>
+	</div>
+	<div class="col input-group">
+	  <input type="text" class="form-control form-control-sm" ng-model="newdqa" placeholder="Nouveau manager QA">
+	  <span class="input-group-append">
+	    <button class="btn btn-sm btn-success" ng-disabled="!newdqa.length"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span></button>
+	  </span>
+	</div>
+      </form>
     </div>
-   </form>
+   </div>
 
     <form ng-submit="saveChallengeInfo()" class="card my-3">
       <div class="card-header">