diff --git a/classes/incident.php b/classes/incident.php
index 3144ebe..0e3cd46 100644
--- a/classes/incident.php
+++ b/classes/incident.php
@@ -117,9 +117,9 @@ class Incident implements JsonSerializable
         $services = $_POST['services'];
       }
 
-      if (!empty($_POST['time'])){
-        $input_time = (isset($_POST['time_js'])?$_POST['time_js']: $_POST['time']);
-        $input_end_time = (isset($_POST['end_time_js'])?$_POST['end_time_js']: $_POST['end_time']);
+      if (!empty($_POST['time']) && $type == 2){
+        $input_time = (!empty($_POST['time_js'])?$_POST['time_js']: $_POST['time']);
+        $input_end_time = (!empty($_POST['end_time_js'])?$_POST['end_time_js']: $_POST['end_time']);
         $time = strtotime($input_time);  
         $end_time = strtotime($input_end_time);
         if (!$time)
@@ -133,6 +133,12 @@ class Incident implements JsonSerializable
           $message = _("End date format is not recognized. Please use ISO 8601 format.");
           return;
         }
+
+        if ($time >= $end_time)
+        {
+          $message = _("End time is either the same or earlier than start time!");
+          return;
+        }
       }else{
         $time = time();
         $end_time = '';
diff --git a/js/admin.js b/js/admin.js
index 4d57113..194de04 100644
--- a/js/admin.js
+++ b/js/admin.js
@@ -15,6 +15,8 @@
 
 		$("#new-incident .panel.new .panel-heading i").get(0).className = icons[val];
 		$("#new-incident .panel.new").get(0).className = classes[val] + " new";
+		$('#time_input').val('');
+		$('#end_time').val('');
 	});
 
 	$("#new-incident select").trigger("change");
@@ -24,7 +26,7 @@
 		var end_time = Date.parse($('#end_time').val());
 		var type = $("#type").val() || 0;
 
-		if (type === 2 &&(isNaN(time) || isNaN(end_time)))
+		if (type == 2 &&(isNaN(time) || isNaN(end_time)))
 		{
 			if (isNaN(end_time))
 			{
@@ -39,7 +41,7 @@
 			}
 			return false;	
 		}
-		else if (type === 2 && time >= end_time)
+		else if (type == 2 && time >= end_time)
 		{
 			$.growl.error({ message: "End time is either the same or earlier than start time!" });
 			$('#time').addClass("error");
@@ -47,7 +49,7 @@
 			return false;	
 		}
 
-		if($('#status-container :checkbox:checked').length === 0)
+		if($('#status-container :checkbox:checked').length == 0)
 		{
 			$.growl.error({ message: "Please check at least one service!" });
 			$('#status-container').addClass("error");