diff --git a/src/Orchard.Web/Modules/Orchard.Forms/Shapes/EditorShapes.cs b/src/Orchard.Web/Modules/Orchard.Forms/Shapes/EditorShapes.cs
index 25266db5b..3557f48c2 100644
--- a/src/Orchard.Web/Modules/Orchard.Forms/Shapes/EditorShapes.cs
+++ b/src/Orchard.Web/Modules/Orchard.Forms/Shapes/EditorShapes.cs
@@ -224,6 +224,12 @@ namespace Orchard.Forms.Shapes {
             return DisplayShapeAsInput(Display, Shape, "text");
         }
 
+        [Shape]
+        public IHtmlString Password(dynamic Display, dynamic Shape) {
+            Shape.Classes.Add("password");
+            return DisplayShapeAsInput(Display, Shape, "password");
+        }
+
         [Shape]
         public void Textarea(
             TextWriter Output,