diff --git a/Clckwrks/Authenticate/Page/ChangePassword.hs b/Clckwrks/Authenticate/Page/ChangePassword.hs
--- a/Clckwrks/Authenticate/Page/ChangePassword.hs
+++ b/Clckwrks/Authenticate/Page/ChangePassword.hs
@@ -9,8 +9,11 @@
 
 changePasswordPanel :: ClckT ClckURL (ServerPartT IO) Response
 changePasswordPanel =
-    do template "Upload Medium" () $ [hsx|
+    do template "Change Password" () $ [hsx|
         <%>
-         <up-change-password />
+         <h2>Change Password</h2>
+         <div ng-controller="UsernamePasswordCtrl">
+          <up-change-password />
+         </div>
         </%> |]
 
diff --git a/Clckwrks/ProfileData/EditProfileData.hs b/Clckwrks/ProfileData/EditProfileData.hs
--- a/Clckwrks/ProfileData/EditProfileData.hs
+++ b/Clckwrks/ProfileData/EditProfileData.hs
@@ -39,7 +39,9 @@
                 template "Edit Profile Data" () $ [hsx|
                   <%>
                     <% reform (form action) "epd" updated Nothing (emailFormlet user) %>
-                    <up-change-password />
+--                    <div ng-controller="UsernamePasswordCtrl">
+--                     <up-change-password />
+--                    </div>
                   </%> |]
     where
       updated :: () -> Clck ProfileDataURL Response
diff --git a/clckwrks.cabal b/clckwrks.cabal
--- a/clckwrks.cabal
+++ b/clckwrks.cabal
@@ -1,5 +1,5 @@
 Name:                clckwrks
-Version:             0.25.1
+Version:             0.25.2
 Synopsis:            A secure, reliable content management system (CMS) and blogging platform
 Description:         clckwrks (pronounced, clockworks) aims to compete
                      directly with popular PHP-based blogging and CMS