diff --git a/conf/sccpgeneral.xml.v433 b/conf/sccpgeneral.xml.v433
index 58c6c13..583c421 100644
--- a/conf/sccpgeneral.xml.v433
+++ b/conf/sccpgeneral.xml.v433
@@ -1250,14 +1250,14 @@ and open the template in the editor. Base Version before all crash :-)
     <page_group name="sccp_hw_dev">
         <label>General Device configuration</label>
         <item type="IE" id="1" seq="99">
-            <label>Device SEP ID.[XXXXXXXXXXXX]=MAC</label>
+            <label>Device ID.[XXXXXXXXXXXX]=MAC</label>
             <input>
                 <name>mac</name>
                 <default></default>
                 <class>sccp-custom</class>
                 <options></options>
             </input>
-            <help>The MAC address of the phone. You must specify 12 characters in the format XXXX.XXXX.XXXX or XX-XX-XX-XX-XX-XX or XXXXXXXXXXXX</help>
+            <help>The MAC address of the phone. You must specify 12 characters in the format XXXX.XXXX.XXXX, XX:XX:XX:XX:XX:XX, XX-XX-XX-XX-XX-XX or XXXXXXXXXXXX</help>
         </item>
         <item type="SDM" id="2" seq="99">
             <label>Type</label>
@@ -1280,7 +1280,7 @@ and open the template in the editor. Base Version before all crash :-)
     <page_group name="sccp_hw_dev_edit">
         <label>General Device configuration</label>
         <item type="IE" id="1" seq="99">
-            <label>Device SEP ID</label>
+            <label>Device ID</label>
             <input>
                 <name>mac</name>
                 <default></default>
@@ -1388,7 +1388,7 @@ and open the template in the editor. Base Version before all crash :-)
     <page_group name="sccp_hw_dev_button">
         <label>Buttons Configuration</label>
         <item type="IE" id="1" seq="99">
-            <label>Device MAC SEP.</label>
+            <label>Device MAC.</label>
             <input>
                 <name>mac</name>
                 <default>000000000</default>
@@ -1888,13 +1888,13 @@ and open the template in the editor. Base Version before all crash :-)
     <page_group name="sccp_hw_sip_dev">
         <label>General Device configuration</label>
         <item type="IE" id="1" seq="99">
-            <label>Device SEP ID.[XXXXXXXXXXXX]=MAC</label>
+            <label>Device ID.[XXXXXXXXXXXX]=MAC</label>
             <input>
                 <name>mac</name>
                 <default>000000000</default>
                 <class>sccp-custom</class>
             </input>
-            <help>The MAC address of the phone. You must specify 12 characters in the format XXXX.XXXX.XXXX or XX-XX-XX-XX-XX-XX or XXXXXXXXXXXX</help>
+            <help>The MAC address of the phone. You must specify 12 characters in the format XXXX.XXXX.XXXX, XX:XX:XX:XX:XX:XX, XX-XX-XX-XX-XX-XX or XXXXXXXXXXXX</help>
         </item>
         <item type="SDMS" id="2" seq="99">
             <label>Type</label>
diff --git a/i18n/ru_RU/LC_MESSAGES/sccp_manager.mo b/i18n/ru_RU/LC_MESSAGES/sccp_manager.mo
index 4e99ebb..f18da95 100644
Binary files a/i18n/ru_RU/LC_MESSAGES/sccp_manager.mo and b/i18n/ru_RU/LC_MESSAGES/sccp_manager.mo differ
diff --git a/i18n/ru_RU/LC_MESSAGES/sccp_manager.po b/i18n/ru_RU/LC_MESSAGES/sccp_manager.po
index 4309487..3862a78 100644
--- a/i18n/ru_RU/LC_MESSAGES/sccp_manager.po
+++ b/i18n/ru_RU/LC_MESSAGES/sccp_manager.po
@@ -910,8 +910,8 @@ msgid "General Device configuration"
 msgstr "Абонентского устройство"
 
 #: views/sccpgeneral.xml:
-msgid "Device SEP ID.[XXXXXXXXXXXX]=MAC"
-msgstr "Устройство SEP ID : [XXXXXXXXXXXX]=MAC"
+msgid "Device ID.[XXXXXXXXXXXX]=MAC"
+msgstr "Устройство ID : [XXXXXXXXXXXX]=MAC"
 
 #: views/sccpgeneral.xml:
 msgid ""
@@ -955,8 +955,8 @@ msgid "Device Label"
 msgstr "Название Устройства"
 
 #: views/sccpgeneral.xml:
-msgid "Device SEP ID"
-msgstr "Идентификатор устройства SEP ID"
+msgid "Device ID"
+msgstr "Идентификатор устройства ID"
 
 #: views/sccpgeneral.xml:
 msgid "The information in the upper right corner of the device screen"
@@ -1005,7 +1005,7 @@ msgid "Buttons Configuration"
 msgstr "Настройка Кнопок"
 
 #: views/sccpgeneral.xml:
-msgid "Device MAC SEP."
+msgid "Device MAC."
 msgstr "Прямое подключение."
 
 #: views/sccpgeneral.xml:
diff --git a/i18n/sccp_manager.pot b/i18n/sccp_manager.pot
index e9b214d..16f2497 100644
--- a/i18n/sccp_manager.pot
+++ b/i18n/sccp_manager.pot
@@ -679,7 +679,7 @@ msgid "General Device configuration"
 msgstr ""
 
 #: views/sccpgeneral.xml:
-msgid "Device SEP ID.[XXXXXXXXXXXX]=MAC"
+msgid "Device ID.[XXXXXXXXXXXX]=MAC"
 msgstr ""
 
 #: views/sccpgeneral.xml:
@@ -707,7 +707,7 @@ msgid "Device Label"
 msgstr ""
 
 #: views/sccpgeneral.xml:
-msgid "Device SEP ID"
+msgid "Device ID"
 msgstr ""
 
 #: views/sccpgeneral.xml:
@@ -743,7 +743,7 @@ msgid "Buttons Configuration"
 msgstr ""
 
 #: views/sccpgeneral.xml:
-msgid "Device MAC SEP."
+msgid "Device MAC."
 msgstr ""
 
 #: views/sccpgeneral.xml:
diff --git a/views/form.adddevice.php b/views/form.adddevice.php
index 186d9e2..6626e6c 100644
--- a/views/form.adddevice.php
+++ b/views/form.adddevice.php
@@ -28,7 +28,7 @@ if (!empty($_REQUEST['new_id'])) {
 
     // Overwrite some specific defaults based on $_REQUEST
     $val = str_replace(array('SEP','ATA','VG'), '', $dev_id);
-    $val = implode('.', sscanf($val, '%4s%4s%4s')); // Convert to Cisco display Format
+    $val = implode(':', sscanf($val, '%2s%2s%2s%2s%2s%2s')); // Convert to Cisco display Format
     $def_val['mac'] = array("keyword" => 'mac', "data" => $val, "seq" => "99");
     $val = $_REQUEST['type'];
     $def_val['type'] = array("keyword" => 'type', "data" => $val, "seq" => "99");
@@ -66,7 +66,7 @@ if (!empty($_REQUEST['id'])) {
                 case 'name':
                     $key = 'mac';   //This is the key that formShow expects
                     $val = str_replace(array('SEP','ATA','VG'), '', $val);
-                    $val = implode('.', sscanf($val, '%4s%4s%4s')); // Convert to Cisco display Format
+                    $val = implode(':', sscanf($val, '%2s%2s%2s%2s%2s%2s')); // Convert to Cisco display Format
                     $def_val[$key] = array("keyword" => $key, "data" => $val, "seq" => "99");
                     break;
 //                case 'permit':
diff --git a/views/form.addsdevice.php b/views/form.addsdevice.php
index 5b09bf8..e2cfb4c 100644
--- a/views/form.addsdevice.php
+++ b/views/form.addsdevice.php
@@ -17,7 +17,7 @@ $def_val['directed_pickup_context'] =  array("keyword" => 'directed_pickup_conte
 if (!empty($_REQUEST['new_id'])) {
     $dev_id = $_REQUEST['new_id'];
     $val = str_replace(array('SEP','ATA','VG'), '', $dev_id);
-    $val = implode('.', sscanf($val, '%4s%4s%4s')); // Convert to Cisco display Format
+    $val = implode(':', sscanf($val, '%2s%2s%2s%2s%2s%2s')); // Convert to Cisco display Format
     $def_val['mac'] = array("keyword" => 'mac', "data" => $val, "seq" => "99");
     $val = $_REQUEST['type'];
     $def_val['type'] = array("keyword" => 'type', "data" => $val, "seq" => "99");
@@ -51,7 +51,8 @@ if (!empty($_REQUEST['id'])) {
                 case 'name':
                     $key = 'mac';
                     $val = str_replace(array('SEP','ATA','VG'), '', $val);
-                    $val = implode('.', sscanf($val, '%4s%4s%4s')); // Convert to Cisco display Format
+                    $val = implode(':', sscanf($val, '%2s%2s%2s%2s%2s%2s')); // Convert to Cisco display Format
+                    $def_val[$key] = array("keyword" => $key, "data" => $val, "seq" => "99");
                     break;
                 case '_hwlang':
                     $tmpar =  explode(":", $val);
diff --git a/views/hardware.phone.php b/views/hardware.phone.php
index 562e30c..d350909 100644
--- a/views/hardware.phone.php
+++ b/views/hardware.phone.php
@@ -35,7 +35,7 @@
                     <thead>
                         <tr>
                             <th data-checkbox="true"></th>
-                            <th data-sortable="true" data-field="mac"><?php echo _('Device SEP ID') ?></th>
+                            <th data-sortable="true" data-field="mac"><?php echo _('Device ID') ?></th>
                             <th data-sortable="true" data-field="description"><?php echo _('Device  Description') ?></th>
                             <th data-sortable="true" data-formatter="DispayTypeFormatter" data-field="type"><?php echo _('Device type') ?></th>
                             <th data-sortable="true" data-field="button" data-formatter="LineFormatter"><?php echo _('Line') ?></th>
diff --git a/views/hardware.sphone.php b/views/hardware.sphone.php
index 7d5094a..c1321a7 100644
--- a/views/hardware.sphone.php
+++ b/views/hardware.sphone.php
@@ -29,7 +29,7 @@
                     <thead>
                         <tr>
                             <th data-checkbox="true"></th>
-                            <th data-sortable="true" data-field="mac"><?php echo _('Device SEP ID') ?></th>
+                            <th data-sortable="true" data-field="mac"><?php echo _('Device ID') ?></th>
                             <th data-sortable="true" data-field="description"><?php echo _('Device  Descriptions') ?></th>
                             <th data-sortable="true" data-formatter="DispayTypeFormatter" data-field="type"><?php echo _('Device type') ?></th>
                             <th data-sortable="true" data-field="button" data-formatter="LineFormatter"><?php echo _('Line') ?></th>