diff --git a/ui/scripts/events.js b/ui/scripts/events.js
index 820bb70eba0..0ff4429f624 100644
--- a/ui/scripts/events.js
+++ b/ui/scripts/events.js
@@ -103,7 +103,18 @@
 								else
 									return true;
 							}			
-						}											
+						}
+            /*
+						,
+            startdate: {
+              label: 'Start Date',
+							isDatepicker: true
+            },
+            enddate: {
+              label: 'End Date',
+							isDatepicker: true
+            }				
+            */						
 					},						
 					
           dataProvider: function(args) {					  
diff --git a/ui/scripts/ui/dialog.js b/ui/scripts/ui/dialog.js
index a685c918928..7f4827d21c2 100644
--- a/ui/scripts/ui/dialog.js
+++ b/ui/scripts/ui/dialog.js
@@ -308,39 +308,52 @@
           if (field.defaultValue) {
             $input.val(field.defaultValue);
           }
-        } else {
-          // Text field
-          if (field.range) {
-            $input = $.merge(
-              // Range start
-              $('<input>').attr({
-                type: 'text',
-                name: field.range[0]
-              }),
+        } else if (field.isDatepicker) { //jQuery datepicker				
+				  $input = $('<input>').attr({
+						name: key,
+						type: 'text'
+					}).appendTo($value);
 
-              // Range end
-              $('<input>').attr({
-                type: 'text',
-                name: field.range[1]
-              })
-            ).appendTo(
-              $('<div>').addClass('range-edit').appendTo($value)
-            );
+					if (field.defaultValue) {
+						$input.val(field.defaultValue);
+					}
+					if (field.id) {
+						$input.attr('id', field.id);
+					}          
+          $input.addClass("disallowSpecialCharacters"); 										
+					$input.datepicker({dateFormat: 'yy-mm-dd'});	
+				
+				} else if(field.range) {	//2 text fields on the same line (e.g. port range: startPort - endPort)			
+				  $input = $.merge(
+						// Range start
+						$('<input>').attr({
+							type: 'text',
+							name: field.range[0]
+						}),
 
-            $input.wrap($('<div>').addClass('range-item'));
-          } else {
-            $input = $('<input>').attr({
-              name: key,
-              type: field.password || field.isPassword ? 'password' : 'text'
-            }).appendTo($value);
+						// Range end
+						$('<input>').attr({
+							type: 'text',
+							name: field.range[1]
+						})
+					).appendTo(
+						$('<div>').addClass('range-edit').appendTo($value)
+					);
+					$input.wrap($('<div>').addClass('range-item'));					
+					$input.addClass("disallowSpecialCharacters");
+				
+				} else { //text field                  
+					$input = $('<input>').attr({
+						name: key,
+						type: field.password || field.isPassword ? 'password' : 'text'
+					}).appendTo($value);
 
-            if (field.defaultValue) {
-              $input.val(field.defaultValue);
-            }
-			if (field.id) {
-              $input.attr('id', field.id);
-            }
-          }
+					if (field.defaultValue) {
+						$input.val(field.defaultValue);
+					}
+					if (field.id) {
+						$input.attr('id', field.id);
+					}          
           $input.addClass("disallowSpecialCharacters");
         }