=== modified file 'src/maasserver/forms.py'
--- src/maasserver/forms.py	2016-06-16 15:17:32 +0000
+++ src/maasserver/forms.py	2016-06-30 21:19:56 +0000
@@ -846,6 +846,11 @@
         initial=Zone.objects.get_default_zone,
         queryset=Zone.objects.all(), to_field_name='name')
 
+    owner = forms.ModelChoiceField(
+        label="Owner", required=False,
+        initial=None,
+        queryset=User.objects.all(), to_field_name='username')
+
     cpu_count = forms.IntegerField(
         required=False, initial=0, label="CPU Count")
     memory = forms.IntegerField(
@@ -866,6 +871,8 @@
             data=data, instance=instance, **kwargs)
         self.request = request
         self.set_up_initial_zone(instance)
+        if instance is not None:
+            self.initial['owner'] = instance.owner.username
         # The zone field is not required because we want to be able
         # to omit it when using that form in the API.
         # We don't want the UI to show an entry for the 'empty' zone,
@@ -890,6 +897,9 @@
         zone = self.cleaned_data.get('zone')
         if zone:
             node.zone = zone
+        owner = self.cleaned_data.get('owner')
+        if zone:
+            node.owner = owner
         if kwargs.get('commit', True):
             node.save(*args, **kwargs)
             self.save_m2m()  # Save many to many relations.