diff --git a/rpg-docs/client/views/user/profile/profile.css b/rpg-docs/client/views/user/profile/profile.css
index 93fc9727..5d3a8a1c 100644
--- a/rpg-docs/client/views/user/profile/profile.css
+++ b/rpg-docs/client/views/user/profile/profile.css
@@ -1,4 +1,3 @@
-.profile #at-nav-button {
-	color: #212121;
-    color: rgba(0,0,0,0.87);
+.profile paper-button, .profile a, .profile #at-nav-button {
+	color: #d13b2e;
 }
diff --git a/rpg-docs/client/views/user/profile/profile.html b/rpg-docs/client/views/user/profile/profile.html
index 20c90e00..a68b5ba7 100644
--- a/rpg-docs/client/views/user/profile/profile.html
+++ b/rpg-docs/client/views/user/profile/profile.html
@@ -35,9 +35,16 @@
 							</td>
 							<td></td>
 						</tr>
+						<tr>
+							<td colspan="2">
+								<a href="/change-password">
+									<paper-button>Change password</paper-button>
+								</a>
+							</td>
+						</tr>
 					</table>
 					<div style="max-width: 250px">
-						{{> atForm}}
+						{{> atForm state="signIn"}}
 					</div>
 					{{> atNavButton }}
 				</paper-material>
diff --git a/rpg-docs/client/views/user/profile/usernameDialog.html b/rpg-docs/client/views/user/profile/userNameDialog/usernameDialog.html
similarity index 94%
rename from rpg-docs/client/views/user/profile/usernameDialog.html
rename to rpg-docs/client/views/user/profile/userNameDialog/usernameDialog.html
index dfc304ae..8ed72314 100644
--- a/rpg-docs/client/views/user/profile/usernameDialog.html
+++ b/rpg-docs/client/views/user/profile/userNameDialog/usernameDialog.html
@@ -3,7 +3,7 @@
 		<app-header-layout has-scrolling-region class="feedback flex">
 			<app-header fixed effects="waterfall">
 				<app-toolbar>
-				  <div main-title>Feedback</div>
+				  <div main-title>Change Username</div>
 				</app-toolbar>
 			</app-header>
 			<div class="form flex">
diff --git a/rpg-docs/client/views/user/profile/usernameDialog.js b/rpg-docs/client/views/user/profile/userNameDialog/usernameDialog.js
similarity index 100%
rename from rpg-docs/client/views/user/profile/usernameDialog.js
rename to rpg-docs/client/views/user/profile/userNameDialog/usernameDialog.js