diff --git a/management/server/webui/src/main/webapp/subutai-app/containers/controller.js b/management/server/webui/src/main/webapp/subutai-app/containers/controller.js
index 08434baed26..ab45f1c1691 100755
--- a/management/server/webui/src/main/webapp/subutai-app/containers/controller.js
+++ b/management/server/webui/src/main/webapp/subutai-app/containers/controller.js
@@ -62,6 +62,7 @@ function ContainerViewCtrl($scope, $rootScope, environmentService, SweetAlert, D
 	vm.rollbackSnapshot = rollbackSnapshot;
 	vm.removeSnapshot = removeSnapshot;
 	vm.addSnapshot = addSnapshot;
+	vm.trimPrefix = trimPrefix;
     vm.isAdmin = isAdmin;
 
 	environmentService.getContainersType().success(function (data) {
@@ -454,6 +455,14 @@ function ContainerViewCtrl($scope, $rootScope, environmentService, SweetAlert, D
     }
 
 	function addSnapshot(snapshot){
+
+        snapshot.label = snapshot.label.trim()
+        if ( /^env-/i.test(snapshot.label)){
+                    SweetAlert.swal("Invalid snapshot name", "The snapshot name must not start with \"env-\"", "error");
+
+                    return;
+        }
+
 		var previousWindowKeyDown = window.onkeydown;
 		SweetAlert.swal({
 			title: "Stop container?",
@@ -484,6 +493,10 @@ function ContainerViewCtrl($scope, $rootScope, environmentService, SweetAlert, D
 		});
 	}
 
+	function trimPrefix(label){
+	    return label.replace(/^(env-)/i,"");
+	}
+
 
     var timeout;
     vm.uploadPercent;
diff --git a/management/server/webui/src/main/webapp/subutai-app/containers/partials/manageSnapshots.html b/management/server/webui/src/main/webapp/subutai-app/containers/partials/manageSnapshots.html
index c2f05656689..43cb658a5c0 100755
--- a/management/server/webui/src/main/webapp/subutai-app/containers/partials/manageSnapshots.html
+++ b/management/server/webui/src/main/webapp/subutai-app/containers/partials/manageSnapshots.html
@@ -38,7 +38,7 @@
         <td>Remove</td>
       </tr>
       <tr ng-repeat="(idx, snapshot) in containerViewCtrl.snapshots">
-        <td>{{ snapshot.label }}</td>
+        <td>{{ containerViewCtrl.trimPrefix(snapshot.label); }}</td>
         <td>{{ snapshot.createdTime }}</td>
         <td>
           <a href