diff --git a/templates/user/edit.html b/templates/user/edit.html
index eaa5572..3f5c493 100644
--- a/templates/user/edit.html
+++ b/templates/user/edit.html
@@ -4,36 +4,62 @@
 <div class="be-main">
     <h2>Edit Account</h2>
 
-
     <form class="be-gui-form"
-	  action="/user/edit"
+	  action="/user/edit/display-name"
 	  method="post">
 	<input type="hidden"
 	       name="AUTHENTICITY-TOKEN"
 	       value="{{token}}">
 	<label>Display Name</label>
-	<input type="text"
+	<p class="be-gui-form-hint">
+	    Your 'username' is what you use to login to the
+	    website. That cannot be changed. Your 'display name' is
+	    the name used in places like your Dashboard.
+	</p>
+	<input required
+	       type="text"
 	       name="DISPLAY-NAME"
-	       value="{{user.display-name}}">
+	       value="{{user.display-name}}"
+	       placeholder="Enter your display name here...">
+	<button class="be-gui-button"
+		       title="Click to update your account's display name"
+		       type="submit">
+	    <img alt="Update Account Details"
+		 src="/images/icons/save.png">
+	    Update Display Name
+	</button>
+    </form>
+
+    <form class="be-gui-form"
+	  action="/user/edit/password"
+	  method="post">
+	<input type="hidden"
+	       name="AUTHENTICITY-TOKEN"
+	       value="{{token}}">
 	<label>New Password</label>
-	<input type="password"
-	       name="NEW-PASSWORD">
+	<input required
+	       type="password"
+	       name="NEW-PASSWORD"
+	       placeholder="Enter your new password here...">
 	<label>New Password Check</label>
-	<input type="password"
-	       name="PASSWORD-CHECK">
+	<input required
+	       type="password"
+	       name="PASSWORD-CHECK"
+	       placeholder="Re-enter your new password here to confirm...">
 	<button class="be-gui-button"
-		title="Click to update your account details"
-		type="submit">
+		       title="Click to update your account details"
+		       type="submit">
 	    <img alt="Update Account Details"
 		 src="/images/icons/save.png">
-	    Save Changes
+	    Save New Password
 	</button>
     </form>
 
     <h2>Delete Account</h2>
     <p class="be-gui-form-hint">
 	Warning: This cannot be undone. Enter '{{user.username}}' in
-	the text box before clicking 'Delete Account' to confirm deletion.
+	the text box below before clicking 'Delete Account' to confirm
+	deletion.
     </p>
     <form class="be-gui-form"
 	  action="/user/delete"