diff --git a/workflow/engine/methods/inputdocs/inputdocs_Save.php b/workflow/engine/methods/inputdocs/inputdocs_Save.php
index 050c5cb0b..8bda6c71c 100755
--- a/workflow/engine/methods/inputdocs/inputdocs_Save.php
+++ b/workflow/engine/methods/inputdocs/inputdocs_Save.php
@@ -89,10 +89,10 @@ try {
             }
 
             //Validating the format of the allowed extentions
-            //Allowed Types has to have this format -> *.pdf, *.docx or *.* to all.
+            //Allowed Types has to have this format -> *.pdf, .xls, *.docx, *.*  or .* to all.
             $allowedTypes = explode(", ", $aData['INP_DOC_TYPE_FILE']);
             foreach ($allowedTypes as $types => $val) {
-            	if((preg_match('/^\*\.?[a-zA-Z0-9]{2,15}$/', $val)) || ($val == '*.*')){
+            	if ((preg_match("/^.*\.?[a-zA-Z0-9]{2,15}$/", $val)) || ($val == "*.*") || ($val == ".*")) {
             	}else {
             		$message = G::LoadTranslation( 'ID_UPLOAD_ERR_WRONG_ALLOWED_EXTENSION_FORMAT' );
             		G::SendMessageText( $message, "ERROR" );
diff --git a/workflow/engine/xmlform/cases/cases_AttachInputDocumentGeneral.xml b/workflow/engine/xmlform/cases/cases_AttachInputDocumentGeneral.xml
index e7f40010f..9367ed7f3 100755
--- a/workflow/engine/xmlform/cases/cases_AttachInputDocumentGeneral.xml
+++ b/workflow/engine/xmlform/cases/cases_AttachInputDocumentGeneral.xml
@@ -71,7 +71,13 @@ var verifyInfo = function(oForm)
   allowedTypes = getField('fileTypes').value.split(", ");
 
   for(i=0; i<allowedTypes.length; i++){
-    allowed = allowedTypes[i].replace('*','').replace('.','');
+    var arrayMatch = [];
+    var allowed = "";
+
+    if ((arrayMatch = /^.*\.(.+)$/.exec(allowedTypes[i]))) {
+        allowed = arrayMatch[1];
+    }
+
     if((allowed != '*') && (docType.toLowerCase() != allowed.toLowerCase())){
       flag = 1;
     } else {
diff --git a/workflow/engine/xmlform/inputdocs/inputdocs_Options.xml b/workflow/engine/xmlform/inputdocs/inputdocs_Options.xml
index 3482c9246..9007b77b7 100755
--- a/workflow/engine/xmlform/inputdocs/inputdocs_Options.xml
+++ b/workflow/engine/xmlform/inputdocs/inputdocs_Options.xml
@@ -31,12 +31,12 @@ var currentPagedTable = @#PAGED_TABLE_ID;
     }
 
     allowedTypes = getField('INP_DOC_TYPE_FILE').value.split(", ");
-    expreg = /^\*\.?[a-zA-Z0-9]{2,15}$/;
+    expreg = /^.*\.?[a-zA-Z0-9]{2,15}$/;
 
     for(i=0; i<allowedTypes.length; i++){
       atype = allowedTypes[i];
 
-      if((atype=='*.*') || (expreg.test(atype)) ){
+      if ((atype == ".*") || (atype == "*.*") || (expreg.test(atype))) {
         //
       } else {
         alert('@G::LoadTranslation(ID_UPLOAD_ERR_WRONG_ALLOWED_EXTENSION_FORMAT)');