diff --git a/openstack_dashboard/dashboards/settings/password/templates/password/_change.html b/openstack_dashboard/dashboards/settings/password/templates/password/_change.html
index 1ce08a1cba..897c6940e3 100644
--- a/openstack_dashboard/dashboards/settings/password/templates/password/_change.html
+++ b/openstack_dashboard/dashboards/settings/password/templates/password/_change.html
@@ -1,27 +1,7 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
-{% load url from future %}
 
-{% block form_id %}change_password_modal{% endblock %}
-{% block form_action %}{% url 'horizon:settings:password:index' %}{% endblock %}
-
-{% block modal_id %}change_password_modal{% endblock %}
-{% block modal-header %}{% trans "Change Password" %}{% endblock %}
-
-{% block modal-body %}
-<div class="left">
-  <fieldset>
-    {% include "horizon/common/_form_fields.html" %}
-    </fieldset>
-</div>
-<div class="right">
-    <h3>{% trans "Description:" %}</h3>
-    <p>{% trans "Change your password. We highly recommend you create a strong one. " %}</p>
-</div>
+{% block modal-body-right %}
+  <h3>{% trans "Description:" %}</h3>
+  <p>{% trans "Change your password. We highly recommend you create a strong one. " %}</p>
 {% endblock %}
-
-{% block modal-footer %}
-    <button type="submit" class="btn btn-primary">{% trans "Change" %}</button>
-    {% if hide %}<a href="{% url 'horizon:settings:password:index' %}" class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>{% endif %}
-{% endblock %}
-
diff --git a/openstack_dashboard/dashboards/settings/password/views.py b/openstack_dashboard/dashboards/settings/password/views.py
index a21dfc02e0..2905371a32 100644
--- a/openstack_dashboard/dashboards/settings/password/views.py
+++ b/openstack_dashboard/dashboards/settings/password/views.py
@@ -12,6 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from django.core.urlresolvers import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import forms
@@ -22,5 +23,10 @@ from openstack_dashboard.dashboards.settings.password \
 
 class PasswordView(forms.ModalFormView):
     form_class = pass_forms.PasswordForm
-    template_name = 'settings/password/change.html'
+    form_id = "change_password_modal"
+    modal_header = _("Change Password")
+    modal_id = "change_password_modal"
     page_title = _("Change Password")
+    submit_label = _("Change")
+    submit_url = reverse_lazy("horizon:settings:password:index")
+    template_name = 'settings/password/change.html'
diff --git a/openstack_dashboard/dashboards/settings/user/templates/user/_settings.html b/openstack_dashboard/dashboards/settings/user/templates/user/_settings.html
index 434ef2ef87..815e2a9796 100644
--- a/openstack_dashboard/dashboards/settings/user/templates/user/_settings.html
+++ b/openstack_dashboard/dashboards/settings/user/templates/user/_settings.html
@@ -1,26 +1,7 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
-{% load url from future %}
 
-{% block form_id %}user_settings_modal{% endblock %}
-{% block form_action %}{% url 'horizon:settings:user:index' %}{% endblock %}
-
-{% block modal_id %}user_settings_modal{% endblock %}
-{% block modal-header %}{% trans "User Settings" %}{% endblock %}
-
-{% block modal-body %}
-<div class="left">
-  <fieldset>
-    {% include "horizon/common/_form_fields.html" %}
-    </fieldset>
-</div>
-<div class="right">
-    <h3>{% trans "Description:" %}</h3>
-    <p>{% trans "Modify dashboard settings for your user." %}</p>
-</div>
-{% endblock %}
-
-{% block modal-footer %}
-    <button type="submit" class="btn btn-primary">{% trans "Save" %}</button>
-    {% if hide %}<a href="{% url 'horizon:settings:user:index' %}" class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>{% endif %}
+{% block modal-body-right %}
+  <h3>{% trans "Description:" %}</h3>
+  <p>{% trans "Modify dashboard settings for your user." %}</p>
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/settings/user/views.py b/openstack_dashboard/dashboards/settings/user/views.py
index 6f81435948..f692d6e744 100644
--- a/openstack_dashboard/dashboards/settings/user/views.py
+++ b/openstack_dashboard/dashboards/settings/user/views.py
@@ -13,6 +13,7 @@
 #    under the License.
 
 from django.conf import settings
+from django.core.urlresolvers import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import forms
@@ -22,8 +23,13 @@ from openstack_dashboard.dashboards.settings.user import forms as user_forms
 
 class UserSettingsView(forms.ModalFormView):
     form_class = user_forms.UserSettingsForm
-    template_name = 'settings/user/settings.html'
+    form_id = "user_settings_modal"
+    modal_header = _("User Settings")
+    modal_id = "user_settings_modal"
     page_title = _("User Settings")
+    submit_label = _("Save")
+    submit_url = reverse_lazy("horizon:settings:user:index")
+    template_name = 'settings/user/settings.html'
 
     def get_initial(self):
         return {