diff --git a/files/templates/submission.html b/files/templates/submission.html
index bf2cce0e9..1937b2976 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -582,26 +582,30 @@
 				</ul>
 			</div>
 
+			{% if v %}
 			<div id="comment-form-space-{{p.fullname}}" class="comment-write flex px-2.5 md:px-0">
 				<div class="hidden md:block relative flex-shrink-0 mr-4 {{ 'santa' if p.author.patron else 'cap' }}">
 					<img loading="lazy" src="{{v.profile_url}}" class="w-14 h-14 p-[3px] bg-white border border-gray-300 object-cover" alt="my avatar"/>
 				</div>
 				{% include "/comments/CommentForm.html" %}
 			</div>
+			{% endif %}
 
 			{% if not v and not p.is_banned %}
-			<div class="comment-write mb-3 px-2.5 md:px-0">
-				<textarea maxlength="10000" class="comment-box rounded-sm border border-gray-700 border-opacity-40 bg-gray-700 bg-opacity-20 focus:bg-opacity-100 focus:bg-white hover:bg-opacity-30 shadow-inner w-full p-2" name="body" aria-label="With textarea" placeholder="Add your comment..." rows="3" onclick="location.href='/login?redirect={{request.path | urlencode}}';"></textarea>
+			<div class="comment-write flex mb-3 px-2.5 md:px-0">
+				<div class="hidden md:block relative flex-shrink-0 mr-4 {{ 'santa' if p.author.patron else 'cap' }}">
+					<div class="flex items-center justify-center w-14 h-14 p-[3px] bg-gray-400 border border-dashed border-gray-300 object-cover">
+						<i class="fas fa-user fa-fw fa-sm text-gray-300"></i>
+					</div>
+				</div>
+				<textarea maxlength="10000" class="comment-box rounded border border-gray-700 border-opacity-40 bg-gray-700 bg-opacity-20 focus:bg-opacity-100 focus:bg-white hover:bg-opacity-30 shadow-inner w-full p-2" name="body" aria-label="With textarea" placeholder="Add your comment..." rows="3" onclick="location.href='/login?redirect={{request.path | urlencode}}';"></textarea>
 			</div>
 			{% if p.comment_count >= 2 %}
-			<div class="card border-0 mt-4 px-2.5 md:px-0">
-				<div class="card-body">
-					<h5 class="card-title">Jump in the discussion.</h5>
-					<p class="card-text">No email address required.</p>
-					<div>
-						<a href="/signup?redirect={{request.path | urlencode}}" class="btn btn-primary">Sign up</a>
-						<a href="/login?redirect={{request.path | urlencode}}" class="btn btn-link text-muted">Sign in</a>
-					</div>
+			<div class="border-0 mt-4 p-2.5">
+				<h5 class="font-bold text-black mb-2 leading-normal">Become an rDramanaut today.</h5>
+				<div>
+					<a href="/signup?redirect={{request.path | urlencode}}" class="btn btn-red">Sign up</a>
+					<a href="/login?redirect={{request.path | urlencode}}" class="btn btn-gray mt-2">Sign in</a>
 				</div>
 			</div>
 			{% endif %}