diff -Nur smeserver-freepbx-13.old/root/etc/e-smith/db/configuration/migrate/freepbx smeserver-freepbx-13/root/etc/e-smith/db/configuration/migrate/freepbx
--- smeserver-freepbx-13.old/root/etc/e-smith/db/configuration/migrate/freepbx	2018-01-29 15:44:11.493000000 -0500
+++ smeserver-freepbx-13/root/etc/e-smith/db/configuration/migrate/freepbx	2018-01-29 15:55:58.329000000 -0500
@@ -41,3 +41,6 @@
 
 }
 
+#remove DeviceAndUser property
+my $DeviceAndUser = $freepbx->prop('DeviceAndUser');
+    $frepbx->delete_prop('DeviceAndUser') if  defined $DeviceAndUser;