diff --git a/app/time_conditions/time_condition_edit.php b/app/time_conditions/time_condition_edit.php
index 80fa489fb3..2168f6a7d4 100644
--- a/app/time_conditions/time_condition_edit.php
+++ b/app/time_conditions/time_condition_edit.php
@@ -106,7 +106,6 @@
 			}
 
 		//remove the invalid characters from the dialplan name
-			$dialplan_name = str_replace(' ', '_', $dialplan_name);
 			$dialplan_name = str_replace('/', '', $dialplan_name);
 
 		//set the context for users that do not have the permission
@@ -514,6 +513,9 @@
 			}
 			unset($sql, $parameters, $row);
 
+		//remove the underscore in the time condition name
+			$dialplan_name = str_replace('_', ' ', $dialplan_name);
+
 		//get dialplan detail conditions
 			$sql = "select dialplan_detail_group, dialplan_detail_tag, dialplan_detail_type, dialplan_detail_data ";
 			$sql .= "from v_dialplan_details ";
@@ -1215,4 +1217,4 @@ if ($action == 'update') {
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>