diff --git a/pom.xml b/pom.xml
index b62cad6..af9159c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>4.2.0a</version>
+	<version>4.2.0b</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>
diff --git a/src/main/resources/public/scripts/app.js b/src/main/resources/public/scripts/app.js
index 612162d..484f08b 100644
--- a/src/main/resources/public/scripts/app.js
+++ b/src/main/resources/public/scripts/app.js
@@ -2447,8 +2447,11 @@ app.controller('EditController', function ($scope, $location, $http, bridgeServi
 			bridgeService.displayWarn("Error adding device. Name has not been changed from original.", null);
 			return;
 		}
-		if (copy)
+		if (copy) {
 			$scope.device.id = null;
+			$scope.device.uniqueid = null;
+			$scope.device.mapId = $scope.device.mapId + "-copy";
+		}
 		if($scope.mapTypeSelected !== undefined && $scope.mapTypeSelected !== null)
 			$scope.device.mapType = $scope.mapTypeSelected[0];
 		else