diff --git a/tpl/welcome.html b/tpl/welcome.html
index 698edf0..38eed88 100644
--- a/tpl/welcome.html
+++ b/tpl/welcome.html
@@ -156,7 +156,7 @@
 		<section id="badge">
 			{# Badge is always shown #}
 			<h2>Badge</h2>
-			{% if not order.ans('propic') %}
+			{% if (not order.ans('propic')) or (order.ans('is_fursuiter') != 'No' and not order.ans('propic_fursuiter')) %}
 				<p class="notice">⚠️ One or more badge pictures are missing! This will cause you badge to be empty, so make sure to upload something before the deadline!</p>
 			{% endif %}
 			<form method="POST" enctype="multipart/form-data" action="/manage/propic/upload">
@@ -169,7 +169,7 @@
 						{% endif %}
 						<p>Normal Badge</p>
 					</div>
-					{% if order.ans('is_fursuiter') %}
+					{% if order.ans('is_fursuiter') != 'No' %}
 						<div>
 							{% if not order.ans('propic_fursuiter') %}
 								<input type="file" value="" accept="image/jpeg,image/png" name="propic_fursuiter" />