diff --git a/dashboard-ui/scripts/updatepasswordpage.js b/dashboard-ui/scripts/updatepasswordpage.js
index 9c3a009b23..f0b53c6c2f 100644
--- a/dashboard-ui/scripts/updatepasswordpage.js
+++ b/dashboard-ui/scripts/updatepasswordpage.js
@@ -15,8 +15,12 @@
 
             if (user.HasPassword) {
                 $('#btnResetPassword', page).show();
+                $('#fldCurrentPassword', page).show();
+                $('h3', page).html('Update Password').show();
             } else {
                 $('#btnResetPassword', page).hide();
+                $('#fldCurrentPassword', page).hide();
+                $('h3', page).html('Create Password').show();
             }
 
         });
diff --git a/dashboard-ui/updatepassword.html b/dashboard-ui/updatepassword.html
index b07bd16913..88306e3ede 100644
--- a/dashboard-ui/updatepassword.html
+++ b/dashboard-ui/updatepassword.html
@@ -14,9 +14,10 @@
                     <a href="#" data-role="button" class="ui-btn-active">Password</a>
                     <a href="#" data-role="button" onclick="Dashboard.navigate('library.html', true);">Media Library</a>
                 </div>
+                <h3 style="display: none;">Create Password</h3>
                 <form id="updatePasswordForm">
                     <ul data-role="listview" class="ulForm">
-                        <li>
+                        <li id="fldCurrentPassword" style="display: none;">
                             <label for="txtCurrentPassword">Current password: </label>
                             <input type="password" id="txtCurrentPassword" name="txtCurrentPassword" />
                         </li>