diff --git a/debian/changelog.Debian b/debian/changelog.Debian
index 472b1198..30320953 100644
--- a/debian/changelog.Debian
+++ b/debian/changelog.Debian
@@ -1,5 +1,7 @@
 pve-manager (4.0-49) unstable; urgency=medium
 
+  * GUI: add new vtype ConfigId, use it for snapshot names
+
   * IP4_cidr_match: allow short masks like /8
 
  -- Proxmox Support Team <support@proxmox.com>  Fri, 09 Oct 2015 08:16:55 +0200
diff --git a/www/manager/Toolkit.js b/www/manager/Toolkit.js
index d38a82cf..4b665c41 100644
--- a/www/manager/Toolkit.js
+++ b/www/manager/Toolkit.js
@@ -73,7 +73,12 @@ Ext.apply(Ext.form.field.VTypes, {
     StorageId:  function(v) {
         return (/^[a-z][a-z0-9\-\_\.]*[a-z0-9]$/i).test(v);
     },
-    StorageIdText: gettext("Allowed characters") + ": 'a-z', '0-9', '-', '_', '.'",
+    StorageIdText: gettext("Allowed characters") + ": 'A-Z', 'a-z', '0-9', '-', '_', '.'",
+
+    ConfigId:  function(v) {
+        return (/^[a-z][a-z0-9\_]+$/i).test(v);
+    },
+    ConfigIdText: gettext("Allowed characters") + ": 'A-Z', 'a-z', '0-9', '_'",
 
     HttpProxy:  function(v) {
         return (/^http:\/\/.*$/).test(v);
diff --git a/www/manager/lxc/Snapshot.js b/www/manager/lxc/Snapshot.js
index 1743b21f..7b2e33ae 100644
--- a/www/manager/lxc/Snapshot.js
+++ b/www/manager/lxc/Snapshot.js
@@ -71,7 +71,7 @@ Ext.define('PVE.window.LxcSnapshot', {
 		name: 'snapname',
 		value: me.snapname,
 		fieldLabel: gettext('Name'),
-		vtype: 'StorageId',
+		vtype: 'ConfigId',
 		allowBlank: false
 	    }
 	];
diff --git a/www/manager/qemu/Snapshot.js b/www/manager/qemu/Snapshot.js
index 9bc533f4..56729e37 100644
--- a/www/manager/qemu/Snapshot.js
+++ b/www/manager/qemu/Snapshot.js
@@ -71,7 +71,7 @@ Ext.define('PVE.window.Snapshot', {
 		name: 'snapname',
 		value: me.snapname,
 		fieldLabel: gettext('Name'),
-		vtype: 'StorageId',
+		vtype: 'ConfigId',
 		allowBlank: false
 	    }
 	];
diff --git a/www/manager5/Toolkit.js b/www/manager5/Toolkit.js
index e71fb985..201d1318 100644
--- a/www/manager5/Toolkit.js
+++ b/www/manager5/Toolkit.js
@@ -73,7 +73,12 @@ Ext.apply(Ext.form.field.VTypes, {
     StorageId:  function(v) {
         return (/^[a-z][a-z0-9\-\_\.]*[a-z0-9]$/i).test(v);
     },
-    StorageIdText: gettext("Allowed characters") + ": 'a-z', '0-9', '-', '_', '.'",
+    StorageIdText: gettext("Allowed characters") + ":  'A-Z', 'a-z', '0-9', '-', '_', '.'",
+
+    ConfigId:  function(v) {
+        return (/^[a-z][a-z0-9\_]+$/i).test(v);
+    },
+    ConfigIdText: gettext("Allowed characters") + ": 'A-Z', 'a-z', '0-9', '_'",
 
     HttpProxy:  function(v) {
         return (/^http:\/\/.*$/).test(v);