diff --git a/app/components/forms/reset-password-form.js b/app/components/forms/reset-password-form.js
index 412dac04a83..1b0fbbf24ed 100644
--- a/app/components/forms/reset-password-form.js
+++ b/app/components/forms/reset-password-form.js
@@ -34,6 +34,19 @@ export default Component.extend(FormMixin, {
             {
               type   : 'empty',
               prompt : this.l10n.t('Please enter your new password')
+            },
+            {
+              type   : 'minLength[8]',
+              prompt : this.l10n.t('Your password must have at least {ruleValue} characters')
+            }
+          ]
+        },
+        repeatPassword: {
+          identifier : 'password_repeat',
+          rules      : [
+            {
+              type   : 'match[password]',
+              prompt : this.l10n.t('Passwords do not match')
             }
           ]
         }
@@ -42,6 +55,13 @@ export default Component.extend(FormMixin, {
   },
 
   actions: {
+    showNewPassword() {
+      this.toggleProperty('showNewPass');
+    },
+
+    showRepeatPassword() {
+      this.toggleProperty('showRepeatPass');
+    },
     submit() {
       this.onValid(() => {
         let payload = {};
diff --git a/app/templates/components/forms/reset-password-form.hbs b/app/templates/components/forms/reset-password-form.hbs
index 933143cf938..e05ceeb10a4 100644
--- a/app/templates/components/forms/reset-password-form.hbs
+++ b/app/templates/components/forms/reset-password-form.hbs
@@ -20,7 +20,46 @@
             {{#if token}}
               <div class="ui left icon input">
                 <i class="key icon"></i>
-                {{input type='password' name='password' placeholder=(t 'password') value=password}}
+                {{#if showNewPass}}
+                  {{input type='text' name='password' placeholder=(t 'New Password') value=password}}
+                {{else}}
+                  {{input type='password' name='password' placeholder=(t 'New Password') value=password}}
+                {{/if}}
+                <div class="ui small basic icon buttons">
+                  <button type="button" class="ui button" {{action 'showNewPassword'}}>
+                    {{#if showNewPass}}
+                      <i class="hide basic icon"></i>
+                    {{else}}
+                      <i class="unhide basic icon"></i>
+                    {{/if}}
+                  </button>
+                </div>
+              </div>
+            {{else}}
+              <div class="ui left icon input">
+                <i class="mail icon"></i>
+                {{input name='email' placeholder=(t 'Email ID') value=identification}}
+              </div>
+            {{/if}}
+          </div>
+          <div class="field">
+            {{#if token}}
+              <div class="ui left icon input">
+                <i class="key icon"></i>
+                {{#if showRepeatPass}}
+                  {{input type='text' name='password_repeat' placeholder=(t 'Confirm Password') value=password_repeat}}
+                {{else}}
+                  {{input type='password' name='password_repeat' placeholder=(t 'Confirm Password') value=password_repeat}}
+                {{/if}}
+                <div class="ui small basic icon buttons">
+                  <button type="button" class="ui button" {{action 'showRepeatPassword'}}>
+                    {{#if showRepeatPass}}
+                      <i class="hide basic icon"></i>
+                    {{else}}
+                      <i class="unhide basic icon"></i>
+                    {{/if}}
+                  </button>
+                </div>
               </div>
             {{else}}
               <div class="ui left icon input">
@@ -41,4 +80,4 @@
       </div>
     </form>
   </div>
-</div>
+</div>
\ No newline at end of file