diff --git a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/client/EditableValue.java b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/client/EditableValue.java
index aa2b748..eda6b4f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/client/EditableValue.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/client/EditableValue.java
@@ -36,15 +36,15 @@
   private final Button cancel;
   private Image warning;
 
-  EditableValue(String serviceUser, String name) {
-    this(serviceUser, name, null);
+  EditableValue(String serviceUser, String value) {
+    this(serviceUser, value, null);
   }
 
-  EditableValue(final String serviceUser, String name, String href) {
+  EditableValue(final String serviceUser, String value, String href) {
     if (href != null) {
-      labelWidget = new Anchor(name, href);
+      labelWidget = new Anchor(value, href);
     } else {
-      labelWidget = new InlineLabel(name);
+      labelWidget = new InlineLabel(value);
     }
     edit = new Image(ServiceUserPlugin.RESOURCES.edit());
     edit.addStyleName("serviceuser-editButton");
@@ -52,7 +52,7 @@
 
     input = new NpTextBox();
     input.setVisibleLength(25);
-    input.setValue(name);
+    input.setValue(value);
     input.setVisible(false);
     save = new Button();
     save.setText("Save");
diff --git a/src/main/resources/Documentation/rest-api-config.md b/src/main/resources/Documentation/rest-api-config.md
index a134a89..c5958c7 100644
--- a/src/main/resources/Documentation/rest-api-config.md
+++ b/src/main/resources/Documentation/rest-api-config.md
@@ -414,7 +414,7 @@
   DELETE /config/server/@PLUGIN@~serviceusers/JenkinsVoter/email HTTP/1.0
 ```
 
-As response the new email is returned.
+As response "`204 No Content`" is returned.
 
 #### Response
 
