diff --git a/client/entry.coffee b/client/entry.coffee
index fc1436f8..bd3dce5d 100644
--- a/client/entry.coffee
+++ b/client/entry.coffee
@@ -9,6 +9,7 @@ AccountsEntry =
     entrySignUp: '/sign-up'
     extraSignUpFields: []
     showOtherLoginServices: true
+    requirePasswordConfirmation: false
 
   isStringEmail: (email) ->
     emailPattern = /^([\w.-]+)@([\w.-]+)\.([a-zA-Z.]{2,6})$/i
diff --git a/client/helpers.coffee b/client/helpers.coffee
index fb084259..7c57b62d 100644
--- a/client/helpers.coffee
+++ b/client/helpers.coffee
@@ -33,6 +33,9 @@ UI.registerHelper 'loginServices', ->
 UI.registerHelper 'showSignupCode', ->
   AccountsEntry.settings.showSignupCode is true
 
+UI.registerHelper 'showPasswordConfirmation', ->
+  AccountsEntry.settings.requirePasswordConfirmation is true
+
 UI.registerHelper 'passwordLoginService', ->
   !!Package['accounts-password']
 
diff --git a/client/t9n/english.coffee b/client/t9n/english.coffee
index 6181f772..cc76550a 100644
--- a/client/t9n/english.coffee
+++ b/client/t9n/english.coffee
@@ -11,6 +11,7 @@ en =
   resetYourPassword: "Reset your password"
   updateYourPassword: "Update your password"
   password: "Password"
+  confirmPassword: "Confirm Password"
   usernameOrEmail: "Username or email"
   email: "Email"
   ifYouAlreadyHaveAnAccount: "If you already have an account"
@@ -33,6 +34,7 @@ en =
     minChar: "7 character minimum password."
     pwOneLetter: "Password requires 1 letter."
     pwOneDigit: "Password must have at least one digit."
+    pwNoMatch: "Passwords must match."
     usernameRequired: "Username is required."
     emailRequired: "Email is required."
     signupCodeRequired: "Registration code is required."
diff --git a/client/views/resetPassword/resetPassword.coffee b/client/views/resetPassword/resetPassword.coffee
index d957dfd2..9c719f2c 100644
--- a/client/views/resetPassword/resetPassword.coffee
+++ b/client/views/resetPassword/resetPassword.coffee
@@ -8,11 +8,18 @@ Template.entryResetPassword.events
 
   'submit #resetPassword': (event) ->
     event.preventDefault()
-    password = $('input[type="password"]').val()
+    password = $('input[name="new-password"]').val()
 
     passwordErrors = do (password)->
       errMsg = []
       msg = false
+
+      if AccountsEntry.settings.requirePasswordConfirmation
+        password2 = $('input[name="new-password2"]').val()
+
+        if password isnt password2
+          errMsg.push t9n("error.pwNoMatch")
+
       if password.length < 7
         errMsg.push t9n("error.minChar")
       if password.search(/[a-z]/i) < 0
diff --git a/client/views/resetPassword/resetPassword.html b/client/views/resetPassword/resetPassword.html
index b9dfeb0a..35d26889 100644
--- a/client/views/resetPassword/resetPassword.html
+++ b/client/views/resetPassword/resetPassword.html
@@ -13,8 +13,17 @@
         <h3>{{t9n "resetYourPassword"}}</h3>
         <form id='resetPassword'>
           <div class="form-group">
+            {{#if showPasswordConfirmation}}
+              <label>{{t9n "password"}}</label>
+            {{/if}}
             <input type="password" name="new-password" class="form-control" value=''>
           </div>
+          {{#if showPasswordConfirmation}}
+            <div class="form-group">
+              <label>{{t9n "confirmPassword"}}</label>
+              <input type="password" name="new-password2" class="form-control" value=''>
+            </div>
+          {{/if}}
           <button type="submit" class="btn btn-default">{{t9n "updateYourPassword"}}</button>
         </form>
         {{#if showSignupCode}}
diff --git a/client/views/signUp/signUp.coffee b/client/views/signUp/signUp.coffee
index 8eb32bc8..a2864983 100644
--- a/client/views/signUp/signUp.coffee
+++ b/client/views/signUp/signUp.coffee
@@ -78,7 +78,7 @@ AccountsEntry.entrySignUpEvents = {
     formValues = SimpleForm.processForm(event.target)
     extraFields = _.pluck(AccountsEntry.settings.extraSignUpFields, 'field')
     filteredExtraFields = _.pick(formValues, extraFields)
-    password = t.find('input[type="password"]').value
+    password = t.find('input[name="password1"]').value
 
     fields = AccountsEntry.settings.passwordSignupFields
 
@@ -86,6 +86,13 @@ AccountsEntry.entrySignUpEvents = {
     passwordErrors = do (password)->
       errMsg = []
       msg = false
+
+      if AccountsEntry.settings.requirePasswordConfirmation
+        password2 = t.find('input[name="password2"]').value
+
+        if password2 isnt password
+          errMsg.push t9n("error.pwNoMatch")
+
       if password.length < 7
         errMsg.push t9n("error.minChar")
       if password.search(/[a-z]/i) < 0
diff --git a/client/views/signUp/signUp.html b/client/views/signUp/signUp.html
index b2a693c0..64b50528 100644
--- a/client/views/signUp/signUp.html
+++ b/client/views/signUp/signUp.html
@@ -49,9 +49,16 @@ <h3>{{t9n "createAccount"}}</h3>
 
             <div class="form-group">
               <label>{{t9n "password"}}</label>
-              <input type="password" class="form-control" value=''>
+              <input type="password" class="form-control" name="password1" value=''>
             </div>
 
+            {{#if showPasswordConfirmation}}
+              <div class="form-group">
+                <label>{{t9n "confirmPassword"}}</label>
+                <input type="password" class="form-control" name="password2" value=''>
+              </div>
+            {{/if}}
+
             {{#if showSignupCode}}
               <div class="form-group">
                 <label>{{t9n "signupCode"}}</label>