diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/password/v1/password/clientlibs/site/css/passwordview.css b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/password/v1/password/clientlibs/site/css/passwordview.css
index 92944601bf..29293adc97 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/password/v1/password/clientlibs/site/css/passwordview.css
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/password/v1/password/clientlibs/site/css/passwordview.css
@@ -21,7 +21,7 @@
  .cmp-adaptiveform-password__widget {
  
  }
- textarea.cmp-adaptiveform-password__widget{
+ .cmp-adaptiveform-password__widget{
    
  }
  
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/password/v1/password/clientlibs/site/js/passwordview.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/password/v1/password/clientlibs/site/js/passwordview.js
index 8551120ca8..966dd5f42b 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/password/v1/password/clientlibs/site/js/passwordview.js
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/password/v1/password/clientlibs/site/js/passwordview.js
@@ -91,10 +91,10 @@
             const widget = this.getWidget();
             if(widget.value){
                 const widget = this.getWidget();
-                if (widget.type === FormView.Constants.HTML_INPUT_TYPE_PASSWORD) {
-                    widget.type = FormView.Constants.HTML_INPUT_TYPE_TEXT;
+                if (widget.type === "password") {
+                    widget.type = "text";
                     } else {
-                     widget.type = FormView.Constants.HTML_INPUT_TYPE_PASSWORD;
+                     widget.type = "password";
                     }
                 }            
         }       
diff --git a/ui.frontend/src/constants.js b/ui.frontend/src/constants.js
index 7150f728b3..a663f33d5d 100644
--- a/ui.frontend/src/constants.js
+++ b/ui.frontend/src/constants.js
@@ -357,17 +357,5 @@ export const Constants = {
      * @type {string}
      */
     API_PATH_PREFIX : "/adobe/forms/af",
-
-    /**
-     * Html input type text
-     * @type {string}
-     */
-    HTML_INPUT_TYPE_TEXT : "text",
-
-    /**
-     * Html input type password
-     * @type {string}
-     */
-    HTML_INPUT_TYPE_PASSWORD : "password"
 };