diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@
   'names' => array(
     'conpherence.pkg.css' => 'ff161f2d',
     'conpherence.pkg.js' => 'b5b51108',
-    'core.pkg.css' => '005d943f',
+    'core.pkg.css' => '823f43f3',
     'core.pkg.js' => '47a69358',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '90b30783',
@@ -42,7 +42,7 @@
     'rsrc/css/application/base/main-menu-view.css' => '5294060f',
     'rsrc/css/application/base/notification-menu.css' => '6a697e43',
     'rsrc/css/application/base/phui-theme.css' => '9f261c6b',
-    'rsrc/css/application/base/standard-page-view.css' => '89da5a9c',
+    'rsrc/css/application/base/standard-page-view.css' => 'eb5b80c5',
     'rsrc/css/application/chatlog/chatlog.css' => 'd295b020',
     'rsrc/css/application/conduit/conduit-api.css' => '7bc725c4',
     'rsrc/css/application/config/config-options.css' => '0ede4c9b',
@@ -116,7 +116,7 @@
     'rsrc/css/core/core.css' => '9f4cb463',
     'rsrc/css/core/remarkup.css' => '17c0fb37',
     'rsrc/css/core/syntax.css' => 'cae95e89',
-    'rsrc/css/core/z-index.css' => '5e72c4e0',
+    'rsrc/css/core/z-index.css' => '0233d039',
     'rsrc/css/diviner/diviner-shared.css' => '896f1d43',
     'rsrc/css/font/font-awesome.css' => 'e838e088',
     'rsrc/css/font/font-lato.css' => 'c7ccd872',
@@ -809,7 +809,7 @@
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-slowvote-css' => 'a94b7230',
     'phabricator-source-code-view-css' => '4383192f',
-    'phabricator-standard-page-view' => '89da5a9c',
+    'phabricator-standard-page-view' => 'eb5b80c5',
     'phabricator-textareautils' => '320810c8',
     'phabricator-title' => '485aaa6c',
     'phabricator-tooltip' => '8fadb715',
@@ -824,7 +824,7 @@
     'phabricator-uiexample-reactor-select' => 'a155550f',
     'phabricator-uiexample-reactor-sendclass' => '1def2711',
     'phabricator-uiexample-reactor-sendproperties' => 'b1f0ccee',
-    'phabricator-zindex-css' => '5e72c4e0',
+    'phabricator-zindex-css' => '0233d039',
     'phame-css' => 'b3a0b3a3',
     'pholio-css' => 'ca89d380',
     'pholio-edit-css' => '07676f51',
diff --git a/src/applications/people/editor/PhabricatorUserEditor.php b/src/applications/people/editor/PhabricatorUserEditor.php
--- a/src/applications/people/editor/PhabricatorUserEditor.php
+++ b/src/applications/people/editor/PhabricatorUserEditor.php
@@ -540,6 +540,14 @@
         $email->setIsPrimary(1);
         $email->save();
 
+        // If the user doesn't have the verified flag set on their account
+        // yet, set it. We've made sure the email is verified above. See
+        // T12635 for discussion.
+        if (!$user->getIsEmailVerified()) {
+          $user->setIsEmailVerified(1);
+          $user->save();
+        }
+
         $log = PhabricatorUserLog::initializeNewLog(
           $actor,
           $user->getPHID(),