1 files changed, 12 insertions, 2 deletions
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ContactPanelShort.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ContactPanelShort.java
index 4fbe7a0f3d..f35bd4b430 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ContactPanelShort.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ContactPanelShort.java
@@ -19,6 +19,7 @@ import com.google.gerrit.client.Gerrit;
 import com.google.gerrit.client.rpc.GerritCallback;
 import com.google.gerrit.client.ui.OnEditEnabler;
 import com.google.gerrit.common.PageLinks;
+import com.google.gerrit.common.errors.EmailException;
 import com.google.gerrit.reviewdb.client.Account;
 import com.google.gerrit.reviewdb.client.Account.FieldName;
 import com.google.gerrit.reviewdb.client.AccountExternalId;
@@ -300,7 +301,15 @@ class ContactPanelShort extends Composite {
           public void onFailure(final Throwable caught) {
             inEmail.setEnabled(true);
             register.setEnabled(true);
-            super.onFailure(caught);
+            if (caught.getMessage().startsWith(EmailException.MESSAGE)) {
+              final ErrorDialog d =
+                  new ErrorDialog(caught.getMessage().substring(
+                      EmailException.MESSAGE.length()));
+              d.setText(Util.C.errorDialogTitleRegisterNewEmail());
+              d.center();
+            } else {
+              super.onFailure(caught);
+            }
           }
         });
       }
@@ -339,7 +348,7 @@ class ContactPanelShort extends Composite {
 
   void doSave(final AsyncCallback<Account> onSave) {
     String newName = canEditFullName() ? nameTxt.getText() : null;
-    if ("".equals(newName)) {
+    if (newName != null && newName.trim().isEmpty()) {
       newName = null;
     }
 
@@ -383,6 +392,7 @@ class ContactPanelShort extends Composite {
     me.setFullName(result.getFullName());
     me.setPreferredEmail(result.getPreferredEmail());
     Gerrit.refreshMenuBar();
+    display(me);
   }
 
   ContactInformation toContactInformation() {