diff --git a/sccpManClasses/Sccp.class.php.v433 b/sccpManClasses/Sccp.class.php.v433
index f5d2517..cecbe41 100644
--- a/sccpManClasses/Sccp.class.php.v433
+++ b/sccpManClasses/Sccp.class.php.v433
@@ -217,6 +217,7 @@ class Sccp extends \FreePBX\modules\Core\Driver {
 
     public function getDefaultDeviceSettings($id, $displayname, &$flag) {
         // FreePBX required method
+        $settings = array();
         $settingsFields = array('mailbox', 'incominglimit', 'context', 'directed_pickup_context', 'callgroup', 'pickupgroup', 'namedcallgroup',
                             'namedpickupgroup', 'adhocNumber', 'secondary_dialtone_digits', 'secondary_dialtone_tone', 'directed_pickup', 'pickup_modeanswer',
                             'transfer', 'echocancel', 'dnd', 'silencesuppression', 'musicclass', 'pin', 'allow', 'disallow');
diff --git a/views/form.adddevice.php b/views/form.adddevice.php
index e05a403..a1d46c9 100644
--- a/views/form.adddevice.php
+++ b/views/form.adddevice.php
@@ -46,7 +46,7 @@ if (!empty($_REQUEST['id'])) {
                             $def_val[$key] = array('keyword' => $key, 'data' => $val, 'seq' => 99);
                         }
                         // Do not store value and let defaults apply
-                        continue;
+                        break;
                     }
                     $def_val[$key] = array("keyword" => $key, "data" => $val, "seq" => "99");
                     // Need to assign defaultLine as not set in the db.