diff --git a/ssl_mgmt/ssl_mgmt b/ssl_mgmt/ssl_mgmt
index 1303e6d..f1c9cb1 100755
--- a/ssl_mgmt/ssl_mgmt
+++ b/ssl_mgmt/ssl_mgmt
@@ -126,7 +126,10 @@ get_field_from_line ()
 	line="$1"
 	field="$2"
 	result="${line#*$field=}"
-	echo "${result%%/*}"
+	if [ "$result" != "$line" ]
+	then
+		echo "${result%%/*}"
+	fi
 }
 
 get_cert_params ()
@@ -170,10 +173,7 @@ add_to_replace_cmd ()
 	replaceCmd="$1"
 	key="$2"
 	value="$3"
-	if [ -n "$value" ]
-	then
-		echo "$replaceCmd${replaceCmd:+;}s/$key/$value/"
-	fi
+	echo "$replaceCmd${replaceCmd:+;}s/$key/${value:-}/"
 }
 
 generate_config ()
@@ -199,8 +199,7 @@ generate_config ()
 			editor $cnfTmpFile
 		fi
 	fi
-	grep -v "@[A-Z]\+@" $cnfTmpFile > $confFile
-	rm $cnfTmpFile
+	mv $cnfTmpFile $confFile
 }
 
 generate_cert ()