diff --git a/lib/copy_this/www/pages/getnzb.php b/lib/copy_this/www/pages/getnzb.php
index 65ee26bdc..668fb7419 100644
--- a/lib/copy_this/www/pages/getnzb.php
+++ b/lib/copy_this/www/pages/getnzb.php
@@ -104,7 +104,7 @@ if (isset($_GET["id"])) {
 	readgzfile($nzbpath);
 
 	// Set the NZB file name.
-	header("Content-Disposition: attachment; filename=" . str_replace(array(',', ' '), '_', $reldata["searchname"]) . ".nzb");
+	header("Content-Disposition: attachment; filename=\"" . str_replace(" ", "_", $reldata["searchname"]) . ".nzb\"");
 	// Get the size of the NZB file.
 	header("Content-Length: " . ob_get_length());
 	header("Content-Type: application/x-nzb");
diff --git a/lib/copy_this/www/pages/profileedit.php b/lib/copy_this/www/pages/profileedit.php
index 88d420cc1..006f1a891 100644
--- a/lib/copy_this/www/pages/profileedit.php
+++ b/lib/copy_this/www/pages/profileedit.php
@@ -52,11 +52,9 @@ switch($action)
 			$errorStr = 'You must enter a NZBGet password!';
 		} else if (isset($_POST['nzbgetusername']) && empty($_POST['nzbgetusername'])) {
 			$errorStr = 'You must enter a NZBGet username!';
-		}
-		else if (!$users->isValidEmail($_POST['email']))
+		} else if (!$users->isValidEmail($_POST['email'])) {
 			$errorStr = "Your email is not a valid format.";
-		else
-		{
+		} else {
 			$res = $users->getByEmail($_POST['email']);
 			if ($res && $res["ID"] != $userid) {
 				$errorStr = "Sorry, the email is already in use.";