diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php
index d08f57f43..33e3bbdef 100755
--- a/gulliver/system/class.xmlform.php
+++ b/gulliver/system/class.xmlform.php
@@ -4409,10 +4409,8 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
                     } else {
                         $isRequired = '0';
                     }
-                    if ($v == 'today') {
-                        $mask = str_replace( "%", "", $this->mask );
-                        $v = date( masktophp($mask, $v) );
-                    }
+                    $mask = str_replace( "%", "", $this->mask );
+                    $v = date( masktophp($mask, $v) );
                     $html = '<input ' . $this->NSRequiredValue() . ' class="module_app_input___gray" id="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" name="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" type ="text" size="' . $this->size . '" maxlength="' . $this->maxLength . '" value="' . $this->htmlentities( $v, ENT_COMPAT, 'utf-8' ) . '" pm:required="' . $isRequired . '" style="display:none;' . htmlentities( $this->style, ENT_COMPAT, 'utf-8' ) . '" ' . $this->NSGridType() . '/>' . htmlentities( $v, ENT_COMPAT, 'utf-8' );
                 } else {
                     $id = 'form[' . $owner->name . '][' . $r . '][' . $this->name . ']';