diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index e108788aa67..3018d9893c5 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -1477,6 +1477,11 @@
                                     displayName: args.data.displayname
                                 });
                             }
+                            if (args.data.name != args.context.instances[0].name) {
+                                $.extend(data, {
+                                    name: args.data.name
+                                });
+                            }
                             $.ajax({
                                 url: createURL('updateVirtualMachine'),
                                 data: data,
@@ -2798,7 +2803,8 @@
                                 converter: cloudStack.converters.toLocalDate
                             },
                             name: {
-                                label: 'label.name'
+                                label: 'label.name',
+                                isEditable: true
                             },
                             id: {
                                 label: 'label.id'