diff --git a/app/components/new-user/template.hbs b/app/components/new-user/template.hbs
index 9a675c5..e5d6fa6 100644
--- a/app/components/new-user/template.hbs
+++ b/app/components/new-user/template.hbs
@@ -3,9 +3,9 @@
     New user's name:
     {{input value=username data-test-selector="new-user-name"}}
   </label>
-  <label>
+  <label data-test-selector="new-user-password">
     New user's password:
-    {{input type='password' value=password data-test-selector="new-user-password"}}
+    {{show-password-toggle value=password}}
   </label>
   <button {{action createUser (hash username=username password=password)}} data-test-selector='new-user-submit'>Add user</button>
 </form>
diff --git a/app/components/show-password-toggle/component.js b/app/components/show-password-toggle/component.js
new file mode 100644
index 0000000..3de1c0f
--- /dev/null
+++ b/app/components/show-password-toggle/component.js
@@ -0,0 +1,9 @@
+import Ember from 'ember';
+
+const {
+  Component
+} = Ember;
+
+export default Component.extend({
+  inputType: 'password'
+});
diff --git a/app/components/show-password-toggle/template.hbs b/app/components/show-password-toggle/template.hbs
new file mode 100644
index 0000000..3abcbfc
--- /dev/null
+++ b/app/components/show-password-toggle/template.hbs
@@ -0,0 +1,11 @@
+{{input type=inputType value=value}}
+{{#if (eq inputType 'password')}}
+  <button {{action (action (mut inputType) 'text')}} data-test-selector="password-visibility-toggle">
+    Show password
+  </button>
+{{else}}
+  <button {{action (action (mut inputType) 'password')}} data-test-selector="password-visibility-toggle">
+    Hide password
+  </button>
+{{/if}}
+
diff --git a/package.json b/package.json
index a19cf9b..d7e5b0c 100644
--- a/package.json
+++ b/package.json
@@ -63,5 +63,8 @@
     "loader.js": "^4.0.1",
     "morgan": "^1.7.0",
     "semantic-release": "^6.2.2"
+  },
+  "dependencies": {
+    "ember-truth-helpers": "^1.2.0"
   }
 }
diff --git a/tests/integration/components/new-user-test.js b/tests/integration/components/new-user-test.js
index 629c032..1e75b0d 100644
--- a/tests/integration/components/new-user-test.js
+++ b/tests/integration/components/new-user-test.js
@@ -22,7 +22,7 @@ test('it renders', function(assert) {
 
   this.$('[data-test-selector="new-user-name"]').val(username);
   this.$('[data-test-selector="new-user-name"]').trigger('change');
-  this.$('[data-test-selector="new-user-password"]').val(password);
-  this.$('[data-test-selector="new-user-password"]').trigger('change');
+  this.$('[data-test-selector="new-user-password"] input').val(password);
+  this.$('[data-test-selector="new-user-password"] input').trigger('change');
   this.$('[data-test-selector="new-user-submit"]').click();
 });
diff --git a/tests/integration/components/show-password-toggle-test.js b/tests/integration/components/show-password-toggle-test.js
new file mode 100644
index 0000000..d8bb242
--- /dev/null
+++ b/tests/integration/components/show-password-toggle-test.js
@@ -0,0 +1,39 @@
+import { moduleForComponent, test } from 'ember-qunit';
+import hbs from 'htmlbars-inline-precompile';
+
+moduleForComponent('show-password-toggle', 'Integration | Component | show password toggle', {
+  integration: true
+});
+
+test('it toggles input type', function(assert) {
+  assert.expect(2);
+
+  this.render(hbs`{{show-password-toggle}}`);
+
+  assert.equal(this.$('input').attr('type'), 'password');
+
+  this.$('[data-test-selector="password-visibility-toggle"]').click();
+
+  assert.equal(this.$('input').attr('type'), 'text');
+});
+
+test('it binds to `value` just like `{{input`', function(assert) {
+  assert.expect(3);
+
+  this.set('value', 'hello');
+
+  this.render(hbs`{{show-password-toggle value=value}}`);
+
+  assert.equal(this.$('input').val(), 'hello');
+
+  this.$('input').val('hello world');
+  this.$('input').trigger('change');
+
+  assert.equal(this.get('value'), 'hello world');
+
+  this.$('[data-test-selector="password-visibility-toggle"]').click();
+  this.$('input').val('hello world!');
+  this.$('input').trigger('change');
+
+  assert.equal(this.get('value'), 'hello world!');
+});