diff --git a/actions/editgroup.php b/actions/editgroup.php
index 35dd25b896..7439b9d030 100644
--- a/actions/editgroup.php
+++ b/actions/editgroup.php
@@ -159,7 +159,7 @@ class EditgroupAction extends GroupAction
     function showScripts()
     {
         parent::showScripts();
-        $this->autofocus('nickname');
+        $this->autofocus('newnickname');
     }
 
     function trySave()
@@ -173,7 +173,7 @@ class EditgroupAction extends GroupAction
 
         if (Event::handle('StartGroupSaveForm', array($this))) {
 
-            $nickname    = Nickname::normalize($this->trimmed('nickname'));
+            $nickname    = Nickname::normalize($this->trimmed('newnickname'));
             $fullname    = $this->trimmed('fullname');
             $homepage    = $this->trimmed('homepage');
             $description = $this->trimmed('description');
diff --git a/actions/newgroup.php b/actions/newgroup.php
index c54e24ed95..cf3125fd87 100644
--- a/actions/newgroup.php
+++ b/actions/newgroup.php
@@ -122,7 +122,7 @@ class NewgroupAction extends Action
     {
         if (Event::handle('StartGroupSaveForm', array($this))) {
             try {
-                $nickname = Nickname::normalize($this->trimmed('nickname'));
+                $nickname = Nickname::normalize($this->trimmed('newnickname'));
             } catch (NicknameException $e) {
                 $this->showForm($e->getMessage());
             }
diff --git a/lib/groupeditform.php b/lib/groupeditform.php
index b795c1387d..e943dcd19a 100644
--- a/lib/groupeditform.php
+++ b/lib/groupeditform.php
@@ -144,8 +144,8 @@ class GroupEditForm extends Form
             $this->out->elementStart('li');
             $this->out->hidden('groupid', $id);
             // TRANS: Field label on group edit form.
-            $this->out->input('nickname', _('Nickname'),
-                              ($this->out->arg('nickname')) ? $this->out->arg('nickname') : $nickname,
+            $this->out->input('newnickname', _('Nickname'),
+                              ($this->out->arg('newnickname')) ? $this->out->arg('newnickname') : $nickname,
                               // TRANS: Field title on group edit form.
                               _('1-64 lowercase letters or numbers, no punctuation or spaces.'));
             $this->out->elementEnd('li');