diff --git a/mu4e/mu4e-context.el b/mu4e/mu4e-context.el
index 6900753f..1c33dac3 100644
--- a/mu4e/mu4e-context.el
+++ b/mu4e/mu4e-context.el
@@ -109,7 +109,6 @@ none."
 Also:
 - Add the context to the `mu4e-contexts'.
 - Update the bookmarks to ignore the trash folder if NO-TRASH-FLAG is non-nil.
-- Update the `mu4e-user-mail-address-list'.
 
 Options beyond those of `make-mu4e-context':
 - `user-mail-address': Defaults to the global value when the context is created.
diff --git a/mu4e/mu4e-utils.el b/mu4e/mu4e-utils.el
index a285ab71..79ae8dde 100644
--- a/mu4e/mu4e-utils.el
+++ b/mu4e/mu4e-utils.el
@@ -780,8 +780,6 @@ nothing."
   "Handle 'pong' responses from the mu server."
   (setq mu4e~server-props (plist-get data :props)) ;; save info from the server
   (let ((doccount (plist-get mu4e~server-props :doccount)))
-    (unless (mu4e-context-current)
-      (mu4e~context-autoswitch nil mu4e-context-policy))
     (mu4e~check-requirements)
     (when func (funcall func))
     (when (zerop doccount)
@@ -800,6 +798,8 @@ context yet, switch to the matching one, or none matches, the
 first. If mu4e is already running, execute function FUNC (if
 non-nil). Otherwise, check various requireme`'nts, then start mu4e.
 When successful, call FUNC (if non-nil) afterwards."
+  (unless (mu4e-context-current)
+    (mu4e~context-autoswitch nil mu4e-context-policy))
   (setq mu4e-pong-func (lambda (info) (mu4e~pong-handler info func)))
   (mu4e~proc-ping
    (mapcar