diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/errors/NameAlreadyUsedException.java b/gerrit-common/src/main/java/com/google/gerrit/common/errors/NameAlreadyUsedException.java
index d3988ff21a..ea20e2edb6 100644
--- a/gerrit-common/src/main/java/com/google/gerrit/common/errors/NameAlreadyUsedException.java
+++ b/gerrit-common/src/main/java/com/google/gerrit/common/errors/NameAlreadyUsedException.java
@@ -18,13 +18,9 @@ package com.google.gerrit.common.errors;
 public class NameAlreadyUsedException extends Exception {
   private static final long serialVersionUID = 1L;
 
-  public static final String MESSAGE = "Name Already Used";
-
-  public NameAlreadyUsedException() {
-    super(MESSAGE);
-  }
+  public static final String MESSAGE = "Name Already Used: ";
 
   public NameAlreadyUsedException(String name) {
-    super(MESSAGE + ": " + name);
+    super(MESSAGE + name);
   }
 }
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.java
index 8a57515aac..0b57bcb478 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.java
@@ -44,7 +44,6 @@ public interface GerritConstants extends Constants {
 
   String notFoundTitle();
   String notFoundBody();
-  String nameAlreadyUsedBody();
   String noSuchAccountTitle();
 
   String noSuchGroupTitle();
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.properties
index 3eee2bec07..f7033e4fef 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.properties
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.properties
@@ -27,7 +27,6 @@ notSignedInBody = <b>Session Expired</b>\
 
 notFoundTitle = Not Found
 notFoundBody = The page you requested was not found, or you do not have permission to view this page.
-nameAlreadyUsedBody = The name is already in use.
 noSuchAccountTitle = Code Review - Unknown User
 
 noSuchGroupTitle = Code Review - Unknown Group
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritMessages.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritMessages.java
index 12e7402b90..8fc196aa02 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritMessages.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritMessages.java
@@ -23,6 +23,7 @@ public interface GerritMessages extends Messages {
 
   String noSuchAccountMessage(String who);
   String noSuchGroupMessage(String who);
+  String nameAlreadyUsedBody(String alreadyUsedName);
 
   String branchCreationFailed(String branchName, String error);
   String invalidBranchName(String branchName);
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritMessages.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritMessages.properties
index 84cf476a51..41caa44ccf 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritMessages.properties
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritMessages.properties
@@ -4,6 +4,7 @@ poweredBy = Powered by <a href="http://code.google.com/p/gerrit/" target="_blank
 
 noSuchAccountMessage = {0} is not a registered user.
 noSuchGroupMessage = Group {0} does not exist or is not visible to you.
+nameAlreadyUsedBody = The name {0} is already in use.
 
 branchCreationFailed = Creating branch {0} failed. Error: {1}
 invalidBranchName = The branch name {0} is not valid.
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/GerritCallback.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/GerritCallback.java
index eebbd5a8e9..06d1f0bcad 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/GerritCallback.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/GerritCallback.java
@@ -54,7 +54,9 @@ public abstract class GerritCallback<T> implements
       d.center();
 
     } else if (isNameAlreadyUsed(caught)) {
-      new ErrorDialog(Gerrit.C.nameAlreadyUsedBody()).center();
+      final String msg = caught.getMessage();
+      final String alreadyUsedName = msg.substring(NameAlreadyUsedException.MESSAGE.length());
+      new ErrorDialog(Gerrit.M.nameAlreadyUsedBody(alreadyUsedName)).center();
 
     } else if (isNoSuchGroup(caught)) {
       final String msg = caught.getMessage();
@@ -101,7 +103,7 @@ public abstract class GerritCallback<T> implements
 
   private static boolean isNameAlreadyUsed(final Throwable caught) {
     return caught instanceof RemoteJsonException
-        && caught.getMessage().equals(NameAlreadyUsedException.MESSAGE);
+        && caught.getMessage().startsWith(NameAlreadyUsedException.MESSAGE);
   }
 
   private static boolean isNoSuchGroup(final Throwable caught) {