diff --git a/addon/components/materialize-input.js b/addon/components/materialize-input.js
index 15b6b5e6..73e581be 100644
--- a/addon/components/materialize-input.js
+++ b/addon/components/materialize-input.js
@@ -4,6 +4,7 @@ import layout from '../templates/components/materialize-input';
 
 export default MaterializeInputField.extend({
   layout: layout,
+  type: 'text',
   didInsertElement: function() {
     this._super();
     // make sure the label moves when a value is bound.
@@ -13,4 +14,3 @@ export default MaterializeInputField.extend({
     }
   }
 });
-
diff --git a/addon/templates/components/materialize-input.hbs b/addon/templates/components/materialize-input.hbs
index 9e5717a9..fd5efc82 100644
--- a/addon/templates/components/materialize-input.hbs
+++ b/addon/templates/components/materialize-input.hbs
@@ -1,11 +1,10 @@
 {{#if icon}}
     <i {{bind-attr class="icon :prefix"}}></i>
 {{/if}}
-{{input id=id value=value classNameBindings="validate:validate: errors.firstObject:invalid:valid" type="text"
+{{input id=id value=value classNameBindings="validate:validate: errors.firstObject:invalid:valid" type=type
         required=required pattern=pattern maxlength=maxlength readonly=readonly disabled=disabled
         autocomplete=autocomplete}}
 <label {{bind-attr for=id}}>{{label}}</label>
 <small class="red-text">
   {{#if errors}} {{errors.firstObject}} {{else}} &nbsp; {{/if}}
 </small>
-
diff --git a/tests/dummy/app/templates/input.hbs b/tests/dummy/app/templates/input.hbs
index b6787b63..3ea56ba7 100644
--- a/tests/dummy/app/templates/input.hbs
+++ b/tests/dummy/app/templates/input.hbs
@@ -19,6 +19,7 @@
                 <li>label, default value <span class="default-value badge">null</span></li>
                 <li>icon, default value <span class="default-value badge">null</span></li>
                 <li>value, default value <span class="default-value badge">null</span></li>
+                <li>type, default value <span class="default-value badge">text</span></li>
                 <li>required, default value <span class="default-value badge">false</span></li>
                 <li>readonly, default value <span class="default-value badge">false</span></li>
                 <li>disabled, default value <span class="default-value badge">false</span></li>
@@ -56,6 +57,20 @@
         </div>
     </div>
 
+    <div class="section">
+        <h4 class="col s12 header">Input with type="password"</h4>
+        <div class="button-example">
+            <br/>
+            {{materialize-input value="test" label='Password' type="password"}}
+
+            <pre class=" language-markup">
+<code class=" col s12 language-markup">
+    <span>&#123;&#123;</span>materialize-input value="test" label="Password" type="password"<span>&#125;&#125;</span>
+</code>
+      </pre>
+        </div>
+    </div>
+
 
     <div class="section">
         <h4 class="col s12 header">Validations</h4>
@@ -177,4 +192,3 @@ nameDidChange: function() {
     </div>
 
 </div>
-
diff --git a/tests/unit/components/materialize-input-test.js b/tests/unit/components/materialize-input-test.js
index 1ce2d65d..7c2b8cfa 100644
--- a/tests/unit/components/materialize-input-test.js
+++ b/tests/unit/components/materialize-input-test.js
@@ -51,3 +51,10 @@ test('has an icon', function(assert) {
   this.render();
   assert.ok(component.$('>i').hasClass(icon));
 });
+
+test('has type password', function(assert) {
+  var type = 'password';
+  var component = this.subject({ type: type });
+  this.render();
+  assert.equal(component.$('>input').attr('type'), type);
+});