diff --git a/bookwyrm/templates/snippets/goal_form.html b/bookwyrm/templates/snippets/goal_form.html
index f05d8b8b..fb941d2b 100644
--- a/bookwyrm/templates/snippets/goal_form.html
+++ b/bookwyrm/templates/snippets/goal_form.html
@@ -1,6 +1,10 @@
 {% load i18n %}
 <div class="content">
-    <p>{% blocktrans %}Set a goal for how many books you'll finish reading in {{ year }}, and track your progress throughout the year.{% endblocktrans %}</p>
+    <p>
+        {% blocktrans trimmed %}
+        Set a goal for how many books you'll finish reading in {{ year }}, and track your progress throughout the year.
+        {% endblocktrans %}
+    </p>
 
     <form method="post" name="goal" action="{% url 'user-goal' request.user.localname year %}">
         {% csrf_token %}
@@ -20,7 +24,7 @@
 
             <div class="column">
                 <label class="label" for="privacy_{{ goal.id }}">{% trans "Goal privacy:" %}</label>
-                {% include 'snippets/privacy_select.html' with no_label=True current=goal.privacy uuid=goal.id %}
+                {% include 'snippets/privacy_select.html' with no_label=True current=goal.privacy privacy_uuid=goal.id %}
             </div>
         </div>
 
diff --git a/bookwyrm/templates/snippets/privacy_select.html b/bookwyrm/templates/snippets/privacy_select.html
index e1053051..0e7ce6cd 100644
--- a/bookwyrm/templates/snippets/privacy_select.html
+++ b/bookwyrm/templates/snippets/privacy_select.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 {% load utilities %}
 <div class="select {{ class }}">
-    {% firstof uuid 0|uuid as uuid %}
+    {% firstof privacy_uuid 0|uuid as uuid %}
     {% if not no_label %}
     <label class="is-sr-only" for="privacy_{{ uuid }}">{% trans "Post privacy" %}</label>
     {% endif %}