diff --git a/Sccp_manager.class.php b/Sccp_manager.class.php
index 7e6381e..6ca4219 100644
--- a/Sccp_manager.class.php
+++ b/Sccp_manager.class.php
@@ -1171,7 +1171,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
         $db_field = $this->dbinterface->HWextension_db_SccpTableData("get_columns_sccpdevice");
         $hw_id = (empty($get_settings['sccp_deviceid'])) ? 'new' : $get_settings['sccp_deviceid'];
         $hw_type = (empty($get_settings['sccp_device_typeid'])) ? 'sccpdevice' : $get_settings['sccp_device_typeid'];
-        $update_hw = ($hw_id == 'new') ? 'update' : 'clear';
+        $update_hw = ($hw_id == 'new') ? 'add' : 'clear';
         $hw_prefix = 'SEP';
         if (!empty($get_settings[$hdr_prefix . 'type'])) {
             $value = $get_settings[$hdr_prefix . 'type'];
diff --git a/Sccp_manager.inc/aminterface/Message.class.php b/Sccp_manager.inc/aminterface/Message.class.php
index f28f53d..7963980 100644
--- a/Sccp_manager.inc/aminterface/Message.class.php
+++ b/Sccp_manager.inc/aminterface/Message.class.php
@@ -392,7 +392,7 @@ class SCCPTokenAckAction extends ActionMessage
     {
         parent::__construct('SCCPTokenAck');
         $this->setKey('DeviceId', $DeviceName);
-        $this->setResponseHandler("SCCPGeneric");
+        $this->setResponseHandler("Generic");
     }
 }