diff --git a/assets/css/account/account.scss b/assets/css/account/account.scss
index 9f4333598..7b1a20e31 100644
--- a/assets/css/account/account.scss
+++ b/assets/css/account/account.scss
@@ -81,15 +81,6 @@
   input:not([type='checkbox']) {
     width: 300px;
   }
-  toggle-password {
-    input#current-password-input {
-      border: none;
-      box-shadow: none;
-      height: 20px;
-      width: 300px;
-      outline: none;
-    }
-  }
   .tips,
   .email-tips,
   .password-tips {
@@ -117,11 +108,6 @@
   toggle-password {
     width: 380px;
   }
-  toggle-password {
-    input#current-password-input {
-      width: 300px;
-    }
-  }
   // Social section
   .networks {
     display: block;
diff --git a/assets/css/account/login.scss b/assets/css/account/login.scss
index d30fc5a5c..0d23ca2ba 100644
--- a/assets/css/account/login.scss
+++ b/assets/css/account/login.scss
@@ -9,12 +9,8 @@
     input[type='text'],
     toggle-password {
       width: 380px;
-      padding-right: 10px;
     }
     toggle-password {
-      input#current-password-input {
-        width: 300px;
-      }
     }
 
     p + button {
diff --git a/assets/css/account/register.scss b/assets/css/account/register.scss
index 9ba44a485..7092a17f9 100644
--- a/assets/css/account/register.scss
+++ b/assets/css/account/register.scss
@@ -14,13 +14,6 @@
     toggle-password-with-tips {
       width: 380px;
     }
-    toggle-password,
-    toggle-password-with-tips {
-      input#password-input,
-      input#current-password-input {
-        width: 300px;
-      }
-    }
     input[name='firstname'],
     input[name='lastname'] {
       width: 185px;
@@ -86,9 +79,3 @@
     position: initial;
   }
 }
-
-toggle-password-with-tips label {
-  display: flex !important;
-  line-height: 20px !important;
-  padding-right: 10px !important;
-}
diff --git a/assets/css/directives/toggle-password-with-tips.scss b/assets/css/directives/toggle-password-with-tips.scss
index 3cba767ca..4721b0baf 100644
--- a/assets/css/directives/toggle-password-with-tips.scss
+++ b/assets/css/directives/toggle-password-with-tips.scss
@@ -6,12 +6,24 @@ toggle-password-with-tips {
   flex-direction: row;
   align-items: center;
   justify-content: space-between;
+  position: relative;
+  padding: 0px;
 
 
   input#password-input {
-    width: 155px;
     margin-bottom: 0;
-    padding-left: 0;
     outline: 0;
+    padding-left: 10px;
+    padding-right: 64px;
+    height: 100%;
+    border: none;
+  }
+
+  label {
+    display: flex !important;
+    line-height: 20px !important;
+    position: absolute;
+    top: 10px;
+    right: 0px;
   }
 }
diff --git a/assets/css/directives/toggle-password.scss b/assets/css/directives/toggle-password.scss
index 214e0b549..eaaa446b9 100644
--- a/assets/css/directives/toggle-password.scss
+++ b/assets/css/directives/toggle-password.scss
@@ -6,11 +6,24 @@ toggle-password {
   flex-direction: row;
   align-items: center;
   justify-content: space-between;
+  position: relative;
+  padding: 0px;
 
   input#current-password-input {
-    width: 155px;
     margin-bottom: 0;
-    padding-left: 0;
     outline: 0;
+    width: 100%;
+    padding-left: 10px;
+    padding-right: 64px;
+    height: 100%;
+    border: none;
+  }
+
+  label {
+    display: flex !important;
+    line-height: 20px !important;
+    position: absolute;
+    top: 10px;
+    right: 0px;
   }
 }
diff --git a/assets/css/settings/settings.scss b/assets/css/settings/settings.scss
index 9eee2ccd3..faec06824 100644
--- a/assets/css/settings/settings.scss
+++ b/assets/css/settings/settings.scss
@@ -352,10 +352,7 @@
   @media only screen and (min-width: 768px) {
   }
   .password {
-    padding-left: 30px;
-    height: 40px;
-    padding-left: 15px;
-    padding-right: 5px;
+    padding-left: 0px;/* to override the padding set by topcoder.scss for forms */
     &:hover {
       cursor: text;
     }