diff --git a/www/window/TokenEdit.js b/www/window/TokenEdit.js
index d1c5555b..dfa58919 100644
--- a/www/window/TokenEdit.js
+++ b/www/window/TokenEdit.js
@@ -68,8 +68,10 @@ Ext.define('PBS.window.TokenEdit', {
 	    {
 		xtype: 'proxmoxtextfield',
 		name: 'comment',
-		deleteEmpty: true,
 		fieldLabel: gettext('Comment'),
+		cbind: {
+		    deleteEmpty: "{!isCreate}"
+		},
 	    },
 	],
     },