1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/email/activity/setup/AccountSetupNames.java b/src/com/android/email/activity/setup/AccountSetupNames.java
index b901fec46..e75f84f5d 100644
--- a/src/com/android/email/activity/setup/AccountSetupNames.java
+++ b/src/com/android/email/activity/setup/AccountSetupNames.java
@@ -155,7 +155,10 @@ public class AccountSetupNames extends AccountSetupActivity {
             @Override
             public void onSuccess(String result) {
                 // Views can only be modified on the main thread.
-                mName.setText(result);
+                // Get the name from database,if name is not null,set it into text view.
+                if (!TextUtils.isEmpty(result)) {
+                    mName.setText(result);
+                }
             }
         }.executeParallel((Void[]) null);
     }