diff --git a/src/com/android/email/Controller.java b/src/com/android/email/Controller.java
index 1e9a7854d..63a68a205 100644
--- a/src/com/android/email/Controller.java
+++ b/src/com/android/email/Controller.java
@@ -1494,6 +1494,8 @@ public class Controller {
             switch (statusCode) {
                 case EmailServiceStatus.SUCCESS:
                 case EmailServiceStatus.IN_PROGRESS:
+                // Don't generate error if the account is uninitialized
+                case EmailServiceStatus.ACCOUNT_UNINITIALIZED:
                     return null;
 
                 case EmailServiceStatus.LOGIN_FAILED: