diff --git a/app/pods/protected/users/changepassword/controller.js b/app/pods/protected/users/changepassword/controller.js
new file mode 100644
index 0000000..a157605
--- /dev/null
+++ b/app/pods/protected/users/changepassword/controller.js
@@ -0,0 +1,29 @@
+import Ember from 'ember';
+import ajaxRequest from '../../../../utils/ajax-request';
+
+export default Ember.Controller.extend({
+  passwordConfirm: null,
+
+  actions: {
+    save: function() {
+      if (this.get('password') !== this.get('passwordConfirm')) {
+        this.get('flashMessages').clearMessages();
+        this.get('flashMessages').error("Password fields don't match");
+        return;
+      }
+
+      let url = `${this.get('globals.apiURL')}/api/${this.get('globals.genus')}/users/password`;
+      let options = {
+        method: 'POST',
+        data: {
+          password: this.get('password'),
+        },
+      };
+      ajaxRequest(url, options);
+      this.transitionTo('protected.users.index');
+      this.get('flashMessages').information('Your password has been changed.');
+    },
+
+  },
+
+});
diff --git a/app/pods/protected/users/changepassword/route.js b/app/pods/protected/users/changepassword/route.js
new file mode 100644
index 0000000..982b827
--- /dev/null
+++ b/app/pods/protected/users/changepassword/route.js
@@ -0,0 +1,12 @@
+import Ember from 'ember';
+
+export default Ember.Route.extend({
+  beforeModel: function(transition) {
+    this._super(transition);
+
+    let user_id = transition.params['protected.users.changepassword'].user_id;
+    if (this.get('session.currentUser.id') !== user_id) {
+      this.transitionTo('protected.users.index');
+    }
+  }
+});
diff --git a/app/pods/protected/users/changepassword/template.hbs b/app/pods/protected/users/changepassword/template.hbs
new file mode 100644
index 0000000..b22db6c
--- /dev/null
+++ b/app/pods/protected/users/changepassword/template.hbs
@@ -0,0 +1,24 @@
+<div class="grid-1">
+  <div class="span-1">
+    <fieldset>
+      <legend>Change password</legend>
+      <form {{action 'save' on='submit'}}>
+        <ul>
+          <li>
+            <label>New Password</label>
+            {{input type="password" value=password}}
+          </li>
+          <li>
+            <label>New Password (confirm)</label>
+            {{input type="password" value=passwordConfirm}}
+          </li>
+          <li>
+            <button type="submit" class="button-green smaller">
+              Submit
+            </button>
+          </li>
+        </ul>
+      </form>
+    </fieldset>
+  </div>
+</div>
diff --git a/app/pods/protected/users/show/controller.js b/app/pods/protected/users/show/controller.js
new file mode 100644
index 0000000..481b126
--- /dev/null
+++ b/app/pods/protected/users/show/controller.js
@@ -0,0 +1,7 @@
+import Ember from 'ember';
+
+export default Ember.Controller.extend({
+  isUser: Ember.computed('model.id', 'session.currentUser.id', function() {
+    return this.get('model.id') === this.get('session.currentUser.id');
+  }),
+});
diff --git a/app/pods/protected/users/show/template.hbs b/app/pods/protected/users/show/template.hbs
index 4f7fca9..9d21912 100644
--- a/app/pods/protected/users/show/template.hbs
+++ b/app/pods/protected/users/show/template.hbs
@@ -38,12 +38,20 @@
   </fieldset>
 </div>
 <br>
-{{#link-to 'protected.users.show' model.id class="button-gray smaller"}}
-  Change Password (Does nothing at the moment)
-{{/link-to}}
-{{#if model.canEdit}}
-  <br>
-  {{#link-to 'protected.users.edit' model.id class="button-gray smaller"}}
-    Edit
-  {{/link-to}}
-{{/if}}
+<div class="grid-2 gutter-20">
+  {{#if isUser}}
+    <div class="span-1">
+      {{#link-to 'protected.users.changepassword' model.id class="button-gray smaller"}}
+        Change Password
+      {{/link-to}}
+    </div>
+  {{/if}}
+
+  <div class="span-1">
+    {{#if model.canEdit}}
+      {{#link-to 'protected.users.edit' model.id class="button-gray smaller"}}
+        Edit
+      {{/link-to}}
+    {{/if}}
+  </div>
+</div>
diff --git a/app/router.js b/app/router.js
index 5f48eec..3b3655a 100644
--- a/app/router.js
+++ b/app/router.js
@@ -22,6 +22,7 @@ Router.map(function() {
     this.route('users', function() {
       this.route('show', { path: ':user_id' });
       this.route('edit', { path: ':user_id/edit' });
+      this.route('changepassword', { path: ':user_id/changepassword' });
     });
 
     this.route('compare', function() {