diff --git a/packages/strapi-helper-plugin/lib/src/components/Input/index.js b/packages/strapi-helper-plugin/lib/src/components/Input/index.js
index c8ea6ac01a..726305de12 100644
--- a/packages/strapi-helper-plugin/lib/src/components/Input/index.js
+++ b/packages/strapi-helper-plugin/lib/src/components/Input/index.js
@@ -250,7 +250,7 @@ class Input extends React.Component { // eslint-disable-line react/prefer-statel
             <input
               className={`form-control ${!this.props.deactivateErrorHighlight && !isEmpty(this.state.errors) ? 'is-invalid': ''}`}
               onChange={this.props.onChange}
-              value={this.props.value}
+              value={type === 'password' ? '********' : this.props.value}
               name={this.props.name}
               id={this.props.label}
               onBlur={handleBlur}
diff --git a/packages/strapi-mongoose/lib/utils/index.js b/packages/strapi-mongoose/lib/utils/index.js
index cce47d239f..cc49621ddd 100755
--- a/packages/strapi-mongoose/lib/utils/index.js
+++ b/packages/strapi-mongoose/lib/utils/index.js
@@ -14,6 +14,7 @@ module.exports = mongoose => {
     convertType: mongooseType => {
       switch (mongooseType.toLowerCase()) {
         case 'string':
+        case 'password':
         case 'text':
           return 'String';
         case 'integer':
diff --git a/packages/strapi-plugin-content-manager/admin/src/components/EditForm/index.js b/packages/strapi-plugin-content-manager/admin/src/components/EditForm/index.js
index 5e393b300d..a502aa9a12 100755
--- a/packages/strapi-plugin-content-manager/admin/src/components/EditForm/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/EditForm/index.js
@@ -25,6 +25,8 @@ class EditForm extends React.Component {
 
   getInputType = (type = '') => {
     switch (type.toLowerCase()) {
+      case 'password':
+        return 'password';
       case 'boolean':
         return 'checkbox';
       case 'text':
diff --git a/packages/strapi-plugin-users-permissions/models/User.settings.json b/packages/strapi-plugin-users-permissions/models/User.settings.json
index 2d19ff42dd..fba7372f61 100644
--- a/packages/strapi-plugin-users-permissions/models/User.settings.json
+++ b/packages/strapi-plugin-users-permissions/models/User.settings.json
@@ -20,7 +20,7 @@
       "type": "string"
     },
     "password": {
-      "type": "string",
+      "type": "password",
       "minLength": 6
     },
     "resetPasswordToken": {