diff --git a/helpdesk/templates/helpdesk/user_settings.html b/helpdesk/templates/helpdesk/user_settings.html
index a43c3cd7..843cae55 100644
--- a/helpdesk/templates/helpdesk/user_settings.html
+++ b/helpdesk/templates/helpdesk/user_settings.html
@@ -1,4 +1,4 @@
-{% extends "helpdesk/base.html" %}{% load i18n %}{% load url from future %}
+{% extends "helpdesk/base.html" %}{% load i18n bootstrap %}{% load url from future %}
 
 {% block helpdesk_title %}{% trans "Change User Settings" %}{% endblock %}
 
@@ -9,16 +9,12 @@
 <p>Use the following options to change the way your helpdesk system works for you. These settings do not impact any other user.</p>
 {% endblocktrans %}
 
-<form method='post' action='./'>
-<fieldset>
-    <dl>{% for field in form %}
-        <dt><label for='id_{{ field.name }}'>{{ field.label }}</label></dt>
-        <dd>{{ field }}</dd>
-        {% if field.errors %}<dd class='error'>{{ field.errors }}</dd>{% endif %}
-        {% if field.help_text %}<dd class='form_help_text'>{{ field.help_text }}</dd>{% endif %}
-    {% endfor %}</dl>
-</fieldset>
-<input class="btn btn-primary" type='submit' value='{% trans "Save Options" %}' />
-{% csrf_token %}</form>
+<form role="form" method='post' action='./'>
+    {% csrf_token %}
+    {{ form|bootstrap }}
+    <div class="form-group">
+        <input class="btn btn-primary" type='submit' value='{% trans "Save Options" %}' />
+    </div>
+</form>
 
-{% endblock %}
+{% endblock %}
\ No newline at end of file