diff --git a/ui/core/app/templates/account/change-password.hbs b/ui/core/app/templates/account/change-password.hbs
index ae761d18a..5fc40fb52 100644
--- a/ui/core/app/templates/account/change-password.hbs
+++ b/ui/core/app/templates/account/change-password.hbs
@@ -1,5 +1,25 @@
-<Form::Account::Password::ChangePassword
-  @model={{@model}}
-  @submit={{route-action "changePassword" @model}}
-  @cancel={{route-action "cancel" @model}}
-/>
+{{title (t "actions.change-password")}}
+
+<Rose::Layout::Sidebar as |sidebarLayout|>
+  <sidebarLayout.body>
+    <main>
+      <Rose::Layout::Centered>
+        <Rose::Layout::Page as |page|>
+
+          <page.header>
+            <h2>{{t "actions.change-password"}}</h2>
+          </page.header>
+
+          <page.body>
+            <Form::Account::Password::ChangePassword
+              @model={{@model}}
+              @submit={{route-action "changePassword" @model}}
+              @cancel={{route-action "cancel" @model}}
+            />
+          </page.body>
+
+        </Rose::Layout::Page>
+      </Rose::Layout::Centered>
+    </main>
+  </sidebarLayout.body>
+</Rose::Layout::Sidebar>