diff --git a/src/lib/Hydra/Controller/Jobset.pm b/src/lib/Hydra/Controller/Jobset.pm
index 1cbca3ea..5f3cdb74 100644
--- a/src/lib/Hydra/Controller/Jobset.pm
+++ b/src/lib/Hydra/Controller/Jobset.pm
@@ -10,6 +10,7 @@ use Hydra::Helper::CatalystUtils;
 
 sub jobsetChain :Chained('/') :PathPart('jobset') :CaptureArgs(2) {
     my ($self, $c, $projectName, $jobsetName) = @_;
+    $c->stash->{jobsetName} //= $jobsetName;
 
     my $project = $c->model('DB::Projects')->find($projectName);
 
@@ -17,18 +18,10 @@ sub jobsetChain :Chained('/') :PathPart('jobset') :CaptureArgs(2) {
 
     $c->stash->{project} = $project;
 
-    $c->stash->{jobset_} = $project->jobsets->search({'me.name' => $jobsetName});
-    my $jobset = $c->stash->{jobset_}->single;
+    $c->stash->{jobset} = $project->jobsets->find({ name => $jobsetName });
 
-    if ($jobset) {
-        $c->stash->{jobset} = $jobset;
-    } else {
-        if ($c->action->name eq "jobset" and $c->request->method eq "PUT") {
-            $c->stash->{jobsetName} = $jobsetName;
-        } else {
-            notFound($c, "Jobset ‘$jobsetName’ doesn't exist.");
-        }
-    }
+    notFound($c, "Jobset ‘$jobsetName’ doesn't exist.")
+        if !$c->stash->{jobset} && !($c->action->name eq "jobset" and $c->request->method eq "PUT");
 }
 
 
@@ -45,25 +38,7 @@ sub jobset_GET {
 
     $c->stash->{totalShares} = getTotalShares($c->model('DB')->schema);
 
-    $self->status_ok(
-        $c,
-        entity => $c->stash->{jobset_}->find({}, {
-                columns => [
-                    'me.name',
-                    'me.project',
-                    'me.errormsg',
-                    'me.emailoverride',
-                    'jobsetinputs.name',
-                    {
-                        'jobsetinputs.jobsetinputalts.altnr' => 'jobsetinputalts.altnr',
-                        'jobsetinputs.jobsetinputalts.value' => 'jobsetinputalts.value'
-                    }
-                ],
-                join => { 'jobsetinputs' => 'jobsetinputalts' },
-                collapse => 1,
-                order_by => "me.name"
-            })
-    );
+    $self->status_ok($c, entity => $c->stash->{jobset});
 }
 
 sub jobset_PUT {
@@ -72,67 +47,28 @@ sub jobset_PUT {
     requireProjectOwner($c, $c->stash->{project});
 
     if (defined $c->stash->{jobset}) {
-        error($c, "Cannot rename jobset `$c->stash->{params}->{oldName}' over existing jobset `$c->stash->{jobset}->name") if defined $c->stash->{params}->{oldName} and $c->stash->{params}->{oldName} ne $c->stash->{jobset}->name;
         txn_do($c->model('DB')->schema, sub {
             updateJobset($c, $c->stash->{jobset});
         });
 
-        if ($c->req->looks_like_browser) {
-            $c->res->redirect($c->uri_for($self->action_for("jobset"),
-                [$c->stash->{project}->name, $c->stash->{jobset}->name]) . "#tabs-configuration");
-        } else {
-            $self->status_no_content($c);
-        }
-    } elsif (defined $c->stash->{params}->{oldName}) {
-        my $jobset = $c->stash->{project}->jobsets->find({'me.name' => $c->stash->{params}->{oldName}});
-
-        if (defined $jobset) {
-            txn_do($c->model('DB')->schema, sub {
-                updateJobset($c, $jobset);
-            });
-
-            my $uri = $c->uri_for($self->action_for("jobset"), [$c->stash->{project}->name, $jobset->name]);
-
-            if ($c->req->looks_like_browser) {
-                $c->res->redirect($uri . "#tabs-configuration");
-            } else {
-                $self->status_created(
-                    $c,
-                    location => "$uri",
-                    entity => { name => $jobset->name, uri => "$uri", type => "jobset" }
-                );
-            }
-        } else {
-            $self->status_not_found(
-                $c,
-                message => "Jobset $c->stash->{params}->{oldName} doesn't exist."
-            );
-        }
-    } else {
-        my $exprType =
-            $c->stash->{params}->{"nixexprpath"} =~ /.scm$/ ? "guile" : "nix";
-
-        error($c, "Invalid jobset name: ‘$c->stash->{jobsetName}’") if $c->stash->{jobsetName} !~ /^$jobsetNameRE$/;
+        my $uri = $c->uri_for($self->action_for("jobset"), [$c->stash->{project}->name, $c->stash->{jobset}->name]) . "#tabs-configuration";
+        $self->status_ok($c, entity => { redirect => "$uri" });
+    }
 
+    else {
         my $jobset;
         txn_do($c->model('DB')->schema, sub {
             # Note: $jobsetName is validated in updateProject, which will
             # abort the transaction if the name isn't valid.
             $jobset = $c->stash->{project}->jobsets->create(
-                {name => $c->stash->{jobsetName}, nixexprinput => "", nixexprpath => "", emailoverride => ""});
+                {name => ".tmp", nixexprinput => "", nixexprpath => "", emailoverride => ""});
             updateJobset($c, $jobset);
         });
 
         my $uri = $c->uri_for($self->action_for("jobset"), [$c->stash->{project}->name, $jobset->name]);
-        if ($c->req->looks_like_browser) {
-            $c->res->redirect($uri . "#tabs-configuration");
-        } else {
-            $self->status_created(
-                $c,
-                location => "$uri",
-                entity => { name => $jobset->name, uri => "$uri", type => "jobset" }
-            );
-        }
+        $self->status_created($c,
+            location => "$uri",
+            entity => { name => $jobset->name, uri => "$uri", redirect => "$uri", type => "jobset" });
     }
 }
 
@@ -217,32 +153,15 @@ sub edit : Chained('jobsetChain') PathPart Args(0) {
 }
 
 
-sub submit : Chained('jobsetChain') PathPart Args(0) {
-    my ($self, $c) = @_;
-
-    requirePost($c);
-    requireProjectOwner($c, $c->stash->{project});
-
-    my $newName = trim $c->stash->{params}->{name};
-    my $oldName = trim $c->stash->{jobset}->name;
-    unless ($oldName eq $newName) {
-        $c->stash->{params}->{oldName} = $oldName;
-        $c->stash->{jobsetName} = $newName;
-        undef $c->stash->{jobset};
-    }
-    jobset_PUT($self, $c);
-}
-
-
 sub nixExprPathFromParams {
     my ($c) = @_;
 
     # The Nix expression path must be relative and can't contain ".." elements.
     my $nixExprPath = trim $c->stash->{params}->{"nixexprpath"};
-    error($c, "Invalid Nix expression path: $nixExprPath") if $nixExprPath !~ /^$relPathRE$/;
+    error($c, "Invalid Nix expression path ‘$nixExprPath’.") if $nixExprPath !~ /^$relPathRE$/;
 
     my $nixExprInput = trim $c->stash->{params}->{"nixexprinput"};
-    error($c, "Invalid Nix expression input name: $nixExprInput") unless $nixExprInput =~ /^[[:alpha:]][\w-]*$/;
+    error($c, "Invalid Nix expression input name ‘$nixExprInput’.") unless $nixExprInput =~ /^[[:alpha:]][\w-]*$/;
 
     return ($nixExprPath, $nixExprInput);
 }
@@ -251,7 +170,7 @@ sub nixExprPathFromParams {
 sub checkInputValue {
     my ($c, $type, $value) = @_;
     $value = trim $value;
-    error($c, "Invalid Boolean value: $value") if
+    error($c, "Invalid Boolean value ‘$value’.") if
         $type eq "boolean" && !($value eq "true" || $value eq "false");
     return $value;
 }
@@ -260,8 +179,11 @@ sub checkInputValue {
 sub updateJobset {
     my ($c, $jobset) = @_;
 
-    my $jobsetName = $c->stash->{jobsetName} // $jobset->name;
-    error($c, "Invalid jobset name: ‘$jobsetName’") if $jobsetName !~ /^$jobsetNameRE$/;
+    my $jobsetName = $c->stash->{params}->{name};
+    error($c, "Invalid jobset identifier ‘$jobsetName’.") if $jobsetName !~ /^$jobsetNameRE$/;
+
+    error($c, "Cannot rename jobset to ‘$jobsetName’ since that identifier is already taken.")
+        if $jobsetName ne $jobset->name && defined $c->stash->{project}->jobsets->find({ name => $jobsetName });
 
     # When the expression is in a .scm file, assume it's a Guile + Guix
     # build expression.
@@ -303,11 +225,11 @@ sub updateJobset {
 
     foreach my $inputName (keys %{$c->stash->{params}->{inputs}}) {
         my $inputData = $c->stash->{params}->{inputs}->{$inputName};
-        error($c, "Invalid input name: $inputName") unless $inputName =~ /^[[:alpha:]][\w-]*$/;
+        error($c, "Invalid input name ‘$inputName’.") unless $inputName =~ /^[[:alpha:]][\w-]*$/;
 
         my $inputType = $inputData->{type};
 
-        error($c, "Invalid input type: $inputType") unless defined $c->stash->{inputTypes}->{$inputType};
+        error($c, "Invalid input type ‘$inputType’.") unless defined $c->stash->{inputTypes}->{$inputType};
 
         my $input;
         unless (defined $inputData->{oldName}) {
diff --git a/src/lib/Hydra/Controller/Project.pm b/src/lib/Hydra/Controller/Project.pm
index 78c42db0..09d9bb7e 100644
--- a/src/lib/Hydra/Controller/Project.pm
+++ b/src/lib/Hydra/Controller/Project.pm
@@ -28,7 +28,7 @@ sub projectChain :Chained('/') :PathPart('project') :CaptureArgs(1) {
     ], join => [ 'owner', 'releases', 'jobsets' ], order_by => { -desc => "releases.timestamp" }, collapse => 1 });
 
     notFound($c, "Project ‘$projectName’ doesn't exist.")
-        if (!$c->stash->{project} && !($c->action->name eq "project" and $c->request->method eq "PUT"));
+        if !$c->stash->{project} && !($c->action->name eq "project" and $c->request->method eq "PUT");
 }
 
 
@@ -141,15 +141,6 @@ sub create_jobset : Chained('projectChain') PathPart('create-jobset') Args(0) {
 }
 
 
-sub create_jobset_submit : Chained('projectChain') PathPart('create-jobset/submit') Args(0) {
-    my ($self, $c) = @_;
-
-    $c->stash->{jobsetName} = trim $c->stash->{params}->{name};
-
-    Hydra::Controller::Jobset::jobset_PUT($self, $c);
-}
-
-
 sub updateProject {
     my ($c, $project) = @_;
 
diff --git a/src/root/edit-jobset.tt b/src/root/edit-jobset.tt
index fa364a55..16076692 100644
--- a/src/root/edit-jobset.tt
+++ b/src/root/edit-jobset.tt
@@ -44,7 +44,7 @@
   </table>
 [% END %]
 
-<form class="form-horizontal" action="[% IF create %][% c.uri_for('/project' project.name 'create-jobset/submit') %][% ELSE %][% c.uri_for('/jobset' project.name jobset.name 'submit') %][% END %]" method="post">
+<form class="form-horizontal">
 
   <fieldset>
 
@@ -132,7 +132,7 @@
     [% INCLUDE renderJobsetInputs %]
 
     <div class="form-actions">
-      <button type="submit" class="btn btn-primary"><i class="icon-ok icon-white"></i> [%IF create %]Create[% ELSE %]Apply changes[% END %]</button>
+      <button id="submit-jobset" type="submit" class="btn btn-primary"><i class="icon-ok icon-white"></i> [%IF create %]Create[% ELSE %]Apply changes[% END %]</button>
     </div>
 
   </fieldset>
@@ -145,26 +145,42 @@
     [% INCLUDE renderJobsetInputAlt alt=alt %]
   </tt>
 
-  <script type="text/javascript">
-    $(document).ready(function() {
-      var id = 0;
-
-      $(".add-input").click(function() {
-        var newid = "input-" + id++;
-        var x = $("#input-template").clone(true).attr("id", "").insertBefore($(this).parents("tr")).show();
-        $("#input-template-name", x).attr("name", newid + "-name");
-        $("#input-template-type", x).attr("name", newid + "-type");
-        $("#input-template", x).attr("id", newid);
-        return false;
-      });
-
-      $(".add-inputalt").click(function() {
-        var x = $("#inputalt-template").clone(true).insertBefore($(this)).attr("id", "").show();
-        $("input", x).attr("name", x.parents(".inputalts").attr("id") + "-values");
-      });
-    });
-  </script>
-
 </form>
 
+<script type="text/javascript">
+  $(document).ready(function() {
+    var id = 0;
+
+    $(".add-input").click(function() {
+      var newid = "input-" + id++;
+      var x = $("#input-template").clone(true).attr("id", "").insertBefore($(this).parents("tr")).show();
+      $("#input-template-name", x).attr("name", newid + "-name");
+      $("#input-template-type", x).attr("name", newid + "-type");
+      $("#input-template", x).attr("id", newid);
+      return false;
+    });
+
+    $(".add-inputalt").click(function() {
+      var x = $("#inputalt-template").clone(true).insertBefore($(this)).attr("id", "").show();
+      $("input", x).attr("name", x.parents(".inputalts").attr("id") + "-values");
+    });
+  });
+
+  $("#submit-jobset").click(function() {
+    requestJSON({
+      [% IF create %]
+        url: "[% c.uri_for('/jobset' project.name '.new') %]",
+      [% ELSE %]
+        url: "[% c.uri_for('/jobset' project.name jobset.name) %]",
+      [% END %]
+      data: $(this).parents("form").serialize(),
+      type: 'PUT',
+      success: function(data) {
+        window.location = data.redirect;
+      },
+    });
+    return false;
+  });
+</script>
+
 [% END %]
diff --git a/src/root/edit-project.tt b/src/root/edit-project.tt
index b5da303e..233229ab 100644
--- a/src/root/edit-project.tt
+++ b/src/root/edit-project.tt
@@ -57,23 +57,6 @@
       <button id="submit-project" type="submit" class="btn btn-primary">
         <i class="icon-ok icon-white"></i>
         [%IF create %]Create[% ELSE %]Apply changes[% END %]
-        <script type="text/javascript">
-          $("#submit-project").click(function() {
-            requestJSON({
-              [% IF create %]
-                url: "[% c.uri_for('/project' '.new') %]",
-              [% ELSE %]
-                url: "[% c.uri_for('/project' project.name) %]",
-              [% END %]
-              data: $(this).parents("form").serialize(),
-              type: 'PUT',
-              success: function(data) {
-                window.location = data.redirect;
-              },
-            });
-            return false;
-          });
-        </script>
       </button>
     </div>
 
@@ -81,4 +64,23 @@
 
 </form>
 
+<script type="text/javascript">
+  $("#submit-project").click(function() {
+    requestJSON({
+      [% IF create %]
+        url: "[% c.uri_for('/project' '.new') %]",
+      [% ELSE %]
+        url: "[% c.uri_for('/project' project.name) %]",
+      [% END %]
+      data: $(this).parents("form").serialize(),
+      type: 'PUT',
+      success: function(data) {
+        window.location = data.redirect;
+      },
+    });
+    return false;
+  });
+</script>
+
+
 [% END %]
diff --git a/src/root/static/js/common.js b/src/root/static/js/common.js
index 78269b76..707c0a53 100644
--- a/src/root/static/js/common.js
+++ b/src/root/static/js/common.js
@@ -74,7 +74,7 @@ $(document).ready(function() {
 
 var tabsLoaded = {};
 
-var makeLazyTab = function(tabName, uri) {
+function makeLazyTab(tabName, uri) {
     $('.nav-tabs').bind('show', function(e) {
         var pattern = /#.+/gi;
         var id = e.target.toString().match(pattern)[0];
@@ -87,9 +87,13 @@ var makeLazyTab = function(tabName, uri) {
           });
         }
     });
-}
+};
 
-var requestJSON = function(args) {
+function escapeHTML(s) {
+    return $('<div/>').text(s).html();
+};
+
+function requestJSON(args) {
     args.dataType = 'json';
     args.error = function(data) {
         json = {};
@@ -99,18 +103,18 @@ var requestJSON = function(args) {
         } catch (err) {
         }
         if (json.error)
-            bootbox.alert(json.error);
+            bootbox.alert(escapeHTML(json.error));
         else if (data.responseText)
-            bootbox.alert("Server error: " + data.responseText);
+            bootbox.alert("Server error: " + escapeHTML(data.responseText));
         else
             bootbox.alert("Unknown server error!");
     };
     return $.ajax(args);
-}
+};
 
-var redirectJSON = function(args) {
+function redirectJSON(args) {
     args.success = function(data) {
         window.location = data.redirect;
     };
     return requestJSON(args);
-}
+};