diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js
index 16a058ad400..3682778642c 100644
--- a/ui/scripts/accounts.js
+++ b/ui/scripts/accounts.js
@@ -86,6 +86,15 @@
                   password: {
                     label: 'label.password',
                     validation: { required: true },
+                    isPassword: true,
+                    id: 'password'
+                  },
+                  'password-confirm': {
+                    label: 'label.confirm.password',
+                    validation: {
+                      required: true,
+                      equalTo: '#password'
+                    },
                     isPassword: true
                   },
                   email: {
@@ -683,7 +692,16 @@
                   password: {
                     label: 'label.password',
                     isPassword: true,
-                    validation: { required: true }
+                    validation: { required: true },
+                    id: 'password'
+                  },
+                  'password-confirm': {
+                    label: 'label.confirm.password',
+                    validation: {
+                      required: true,
+                      equalTo: '#password'
+                    },
+                    isPassword: true
                   },
                   email: {
                     label: 'label.email',
@@ -793,8 +811,17 @@
                     newPassword: {
                       label: 'label.new.password',
                       isPassword: true,
-                      validation: { required: true }
-                    }
+                      validation: { required: true },
+					  id: 'newPassword'
+                    },
+					'password-confirm': {
+						label: 'label.confirm.password',
+						validation: {
+							required: true,
+							equalTo: '#newPassword'
+						},
+						isPassword: true
+					}
                   }
                 },
                 action: function(args) {
diff --git a/ui/scripts/ui/dialog.js b/ui/scripts/ui/dialog.js
index b560f1673a6..50c4ed77b6a 100644
--- a/ui/scripts/ui/dialog.js
+++ b/ui/scripts/ui/dialog.js
@@ -321,6 +321,9 @@
 
             if (field.defaultValue) {
               $input.val(field.defaultValue);
+            }
+			if (field.id) {
+              $input.attr('id', field.id);
             }
           }
           $input.addClass("disallowSpecialCharacters");