diff --git a/src/ctfs/templates/ctfs/ctf_info.html b/src/ctfs/templates/ctfs/ctf_info.html
old mode 100644
new mode 100755
index 18eca46..6906ea5
--- a/src/ctfs/templates/ctfs/ctf_info.html
+++ b/src/ctfs/templates/ctfs/ctf_info.html
@@ -31,7 +31,8 @@
         <p>{% trans "Already flagged" %}</p>	
         {% if ctf.ctf_url %}
         <a class="begin-ctf-link" target="_blank" href="{{ ctf.ctf_url }}">{% trans "Start the challenge" %}</a></br>
-        {% elif ctf.file %}
+        {% endif %}
+        {% if ctf.file %}
         <a class="begin-ctf-link" target="_blank" href="{{ ctf.file.url }}">{% trans "Download" %}</a></br>
         {% endif %}
         {% else %}
@@ -40,7 +41,8 @@
         {% endif %}
         {% if ctf.ctf_url %}
         <a class="begin-ctf-link" target="_blank" href="{{ ctf.ctf_url }}">{% trans "Start the challenge" %}</a></br>
-        {% elif ctf.file %}
+        {% endif %}
+        {% if ctf.file %}
         <a class="begin-ctf-link" target="_blank" href="{{ ctf.file.url }}">{% trans "Download" %}</a></br>
         {% endif %}
         <form method="post" class="submitflag-form">
@@ -48,7 +50,6 @@
           <input type="text" name="flag" maxlength="100" required="" id="id_flag">
           <input class="form-control" type="submit" value=">">
         </form>
-        
         {% endif %}
         {% endif %}
       </div>
diff --git a/src/events/templates/events/ctf_info.html b/src/events/templates/events/ctf_info.html
old mode 100644
new mode 100755
index aca18ef..9dbc80a
--- a/src/events/templates/events/ctf_info.html
+++ b/src/events/templates/events/ctf_info.html
@@ -34,7 +34,8 @@
           <span class="message error-msg">{% trans "This is a team event, please create or join a team before submitting flags." %}</span>
           {% if ctf.ctf_url %}
           <a class="begin-ctf-link" target="_blank" href="{{ ctf.ctf_url }}">{% trans "Start the challenge" %}</a></br>
-          {% elif ctf.file %}
+          {% endif %}
+          {% if ctf.file %}
           <a class="begin-ctf-link" target="_blank" href="{{ ctf.file.url }}">{% trans "Download" %}</a></br>
           {% endif %}
         {% else %}
@@ -43,7 +44,8 @@
           {% endif %}
         {% if ctf.ctf_url %}
         <a class="begin-ctf-link" target="_blank" href="{{ ctf.ctf_url }}">{% trans "Start the challenge" %}</a></br>
-        {% elif ctf.file %}
+        {% endif %}
+        {% if ctf.file %}
         <a class="begin-ctf-link" target="_blank" href="{{ ctf.file.url }}">{% trans "Download" %}</a></br>
         {% endif %}
         <form method="post" action="{% url 'events:submit_event_flag' event_slug=event.slug chall_slug=ctf.slug %}" class="submitflag-form">
@@ -51,7 +53,6 @@
           <input type="text" name="flag" maxlength="100" required="" id="id_flag">
           <input class="form-control" type="submit" value=">">
         </form>
-        
         {% endif %}
         {% endif %}
       </div>