diff --git a/app/but/jury_but.py b/app/but/jury_but.py
index 6d3344c3d..9997a7369 100644
--- a/app/but/jury_but.py
+++ b/app/but/jury_but.py
@@ -362,6 +362,13 @@ class DecisionsProposeesAnnee(DecisionsProposees):
                 + f""" et {self.nb_rcues_under_8}
                 niveau{'x' if self.nb_rcues_under_8 > 1 else ''} < 8"""
             )
+        # Si l'un des semestres est extérieur, propose ADM
+        if (
+            self.formsemestre_impair.modalite == "EXT"
+            or self.formsemestre_pair.modalite == "EXT"
+        ):
+            self.codes.insert(0, sco_codes.ADM)
+
         #
 
     def infos(self) -> str:
@@ -798,6 +805,12 @@ class DecisionsProposeesRCUE(DecisionsProposees):
             self.codes.insert(0, sco_codes.ADM)
         else:
             self.codes.insert(0, sco_codes.AJ)
+        # Si au moins l'un des semestres est extérieur, propose ADM au cas où
+        if (
+            dec_prop_annee.formsemestre_impair.modalite == "EXT"
+            or dec_prop_annee.formsemestre_pair.modalite == "EXT"
+        ):
+            self.codes.insert(0, sco_codes.ADM)
 
     def record(self, code: str, no_overwrite=False):
         """Enregistre le code"""
@@ -943,7 +956,9 @@ class DecisionsProposeesUE(DecisionsProposees):
         """Calcul des .codes attribuables et de l'explanation associée"""
         if self.inscription_etat != scu.INSCRIT:
             return
-        if self.moy_ue > (sco_codes.ParcoursBUT.BARRE_MOY - sco_codes.NOTES_TOLERANCE):
+        if (
+            self.moy_ue > (sco_codes.ParcoursBUT.BARRE_MOY - sco_codes.NOTES_TOLERANCE)
+        ) or self.formsemestre.modalite == "EXT":
             self.codes.insert(0, sco_codes.ADM)
             self.explanation = (f"Moyenne >= {sco_codes.ParcoursBUT.BARRE_MOY}/20",)
         elif self.rcue and self.rcue.est_compensable():
diff --git a/app/scodoc/sco_formsemestre_exterieurs.py b/app/scodoc/sco_formsemestre_exterieurs.py
index c8c3ff4ab..baec914d8 100644
--- a/app/scodoc/sco_formsemestre_exterieurs.py
+++ b/app/scodoc/sco_formsemestre_exterieurs.py
@@ -242,6 +242,8 @@ def formsemestre_ext_edit_ue_validations(formsemestre_id, etudid):
     ues = formsemestre.formation.ues.filter(UniteEns.type != UE_SPORT).order_by(
         UniteEns.semestre_idx, UniteEns.numero
     )
+    if formsemestre.formation.is_apc():
+        ues = ues.filter_by(semestre_idx=formsemestre.semestre_id)
     descr = _ue_form_description(formsemestre, etud, ues, scu.get_request_args())
     initvalues = {}
     if request.method == "GET":
diff --git a/app/templates/scodoc/help/modules.html b/app/templates/scodoc/help/modules.html
index 924e128f1..aabce645e 100644
--- a/app/templates/scodoc/help/modules.html
+++ b/app/templates/scodoc/help/modules.html
@@ -46,5 +46,7 @@
     {% endfor %}
 </ul>
 </div>
+{% else %}
+<div><p class="greenboldtext">(module actuellement non utilisé dans les semestres)</p></div>
 {%endif%}