diff --git a/CTFd/themes/core-beta/templates/challenge.html b/CTFd/themes/core-beta/templates/challenge.html
index c60c921071ac2f3433339e6314324b73442aa4bf..a1750ddc04194b93ec610a5540463bcfd22e8efd 100644
--- a/CTFd/themes/core-beta/templates/challenge.html
+++ b/CTFd/themes/core-beta/templates/challenge.html
@@ -240,13 +240,13 @@
               <div class="row text-center">
                 <div class="col-12">
                   <p>
-                    {{ attempts }}/{{ max_attempts }} tentatives{{ max_attempts|pluralize }}
+                    {{ attempts }}/{{ max_attempts }} tentative{{ max_attempts|pluralize }}
                   </p>
                 </div>
               </div>
             {% endif %}
             
-            {% if (not solved_by_me and attempts == 0) or challenge.type == "manualRecursive" or ((max_attempts == 0 or max_attempts > attempts) and challenge.type == "standard" and not solved_by_me) %}
+            {% if (not solved_by_me and attempts == 0) or ((max_attempts == 0 or max_attempts > attempts) and challenge.type == "manualRecursive") or ((max_attempts == 0 or max_attempts > attempts) and challenge.type == "standard" and not solved_by_me) %}
               <div class="row submit-row">
                 <div class="col-12 col-sm-8 w-100">
                   {% block input %}