diff --git a/usr/local/www/pkg_edit.php b/usr/local/www/pkg_edit.php
index ad56f5a9c5..376cd8a433 100644
--- a/usr/local/www/pkg_edit.php
+++ b/usr/local/www/pkg_edit.php
@@ -539,10 +539,13 @@ if ($pkg['tabs'] <> "") {
 			$value = $_POST[$fieldname];
 			if (is_array($value)) $value = implode(',', $value);
 		} else {
-			if (isset($id) && $a_pkg[$id])
+			if (isset($id) && isset($a_pkg[$id][$fieldname])) {
 				$value = $a_pkg[$id][$fieldname];
-			else
-				$value = $pkga['default_value'];
+			} else {
+				if (isset($pkga['default_value'])) {
+					$value = $pkga['default_value'];
+				}
+			}
 		}
 		switch($pkga['type']){
 			case "input":