diff --git a/mediagoblin/templates/mediagoblin/edit/edit_account.html b/mediagoblin/templates/mediagoblin/edit/edit_account.html
index 3f508af4..7fe2c031 100644
--- a/mediagoblin/templates/mediagoblin/edit/edit_account.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit_account.html
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{% extends "mediagoblin/base.html" %}
+{%- extends "mediagoblin/base.html" %}
 
 {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
 
@@ -39,7 +39,7 @@
       <h1>
         {%- trans username=user.username -%}
           Changing {{ username }}'s account settings
-        {%- endtrans %}
+        {%- endtrans -%}
       </h1>
       {{ wtforms_util.render_field_div(form.old_password) }}
       {{ wtforms_util.render_field_div(form.new_password) }}
@@ -47,10 +47,7 @@
         <p>{{ form.wants_comment_notification }}
            {{ wtforms_util.render_label(form.wants_comment_notification) }}</p>
       </div>
-      <div class="form_field_input">
-        <p>{{ form.license_preference }}
-           {{ wtforms_util.render_label(form.license_preference) }}</p>
-      </div>
+      {{- wtforms_util.render_field_div(form.license_preference) }}
       <div class="form_submit_buttons">
         <input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button_form" />
 	{{ csrf_token }}