diff --git a/mo/web/templates/org_contest.html b/mo/web/templates/org_contest.html
index 0f2e8c0efebcfc9fe67512612b69a732f366a675..0007a857353286ba9fc605bf21c46147d5cab9d9 100644
--- a/mo/web/templates/org_contest.html
+++ b/mo/web/templates/org_contest.html
@@ -3,9 +3,10 @@
 {% set state = contest.state %}
 {% set ct_state = contest.ct_state() %}
 {% set can_manage = rights.have_right(Right.manage_contest) %}
-{% set can_upload = rights.can_upload_feedback() %}
+{% set can_upload_feedback = rights.can_upload_feedback() %}
+{% set can_upload_anything = rights.can_upload_feedback() or rights.can_upload_solutions() %}
 {% set can_edit_points = not site and rights.can_edit_points() %}
-{% set can_create_solutions = rights.can_upload_feedback() or rights.can_upload_solutions() %}
+{% set can_create_solutions = rights.can_create_solutions() %}
 {% set offer_view_statement = rights.offer_view_statement() %}
 {% set can_view_contestants = rights.have_right(Right.view_contestants) %}
 {% set can_view_submits = rights.have_right(Right.view_submits) %}
@@ -55,7 +56,7 @@
 {% endif %}
 </table>
 
-{% if can_view_contestants or can_upload or can_manage %}{# Ostatní práva implikují některé z těchto #}
+{% if can_view_contestants or can_upload_anything or can_manage %}{# Ostatní práva implikují některé z těchto #}
 <div class="btn-group">
 	{% if can_view_contestants %}
 	<a class="btn btn-primary" href='{{ ctx.url_for('org_generic_list') }}'>Seznam účastníků</a>
@@ -72,7 +73,7 @@
 	{% if can_view_contestants %}
 	<a class="btn btn-default" href='{{ ctx.url_for('org_contest_protocols') }}'>Protokoly</a>
 	{% endif %}
-	{% if can_upload %}
+	{% if can_upload_anything %}
 	<a class="btn btn-default" href='{{ ctx.url_for('org_contest_scans') }}'>Zpracování skenů</a>
 	{% endif %}
 	{% if not site and can_manage %}
@@ -159,7 +160,7 @@
 		</div>
 		<td><div class="btn-group">
 			<a class="btn btn-xs btn-primary" href="{{ ctx.url_for('org_generic_batch_download', task_id=task.task_id) }}">Stáhnout ZIP</a>
-			{% if can_upload %}
+			{% if can_upload_solutions %}
 				<a class='btn btn-xs btn-default' href="{{ ctx.url_for('org_generic_batch_upload', task_id=task.task_id) }}">Nahrát ZIP</a>
 			{% endif %}
 			{% if can_edit_points %}