diff --git a/src/applications/people/controller/PhabricatorPeopleCreateController.php b/src/applications/people/controller/PhabricatorPeopleCreateController.php
index 04b2f4a8a4..c0b232645b 100644
--- a/src/applications/people/controller/PhabricatorPeopleCreateController.php
+++ b/src/applications/people/controller/PhabricatorPeopleCreateController.php
@@ -1,125 +1,120 @@
 <?php
 
 final class PhabricatorPeopleCreateController
   extends PhabricatorPeopleController {
 
   public function handleRequest(AphrontRequest $request) {
     $admin = $request->getUser();
 
     id(new PhabricatorAuthSessionEngine())->requireHighSecuritySession(
       $admin,
       $request,
       $this->getApplicationURI());
 
     $v_type = 'standard';
     if ($request->isFormPost()) {
       $v_type = $request->getStr('type');
 
       if ($v_type == 'standard' || $v_type == 'bot' || $v_type == 'list') {
         return id(new AphrontRedirectResponse())->setURI(
           $this->getApplicationURI('new/'.$v_type.'/'));
       }
     }
 
     $title = pht('Create New User');
 
     $standard_caption = pht(
       'Create a standard user account. These users can log in to Phabricator, '.
       'use the web interface and API, and receive email.');
 
     $standard_admin = pht(
       'Administrators are limited in their ability to access or edit these '.
       'accounts after account creation.');
 
     $bot_caption = pht(
       'Create a bot/script user account, to automate interactions with other '.
       'systems. These users can not use the web interface, but can use the '.
       'API.');
 
     $bot_admin = pht(
       'Administrators have greater access to edit these accounts.');
 
     $types = array();
 
     $can_create = $this->hasApplicationCapability(
       PeopleCreateUsersCapability::CAPABILITY);
     if ($can_create) {
       $types[] = array(
         'type' => 'standard',
         'name' => pht('Create Standard User'),
         'help' => pht('Create a standard user account.'),
       );
     }
 
     $types[] = array(
       'type' => 'bot',
       'name' => pht('Create Bot User'),
       'help' => pht('Create a new user for use with automated scripts.'),
     );
 
     $types[] = array(
       'type' => 'list',
       'name' => pht('Create Mailing List User'),
       'help' => pht(
         'Create a mailing list user to represent an existing, external '.
         'mailing list like a Google Group or a Mailman list.'),
     );
 
     $buttons = id(new AphrontFormRadioButtonControl())
       ->setLabel(pht('Account Type'))
       ->setName('type')
       ->setValue($v_type);
 
     foreach ($types as $type) {
       $buttons->addButton($type['type'], $type['name'], $type['help']);
     }
 
     $form = id(new AphrontFormView())
       ->setUser($admin)
       ->appendRemarkupInstructions(
         pht(
           'Choose the type of user account to create. For a detailed '.
           'explanation of user account types, see [[ %s | User Guide: '.
           'Account Roles ]].',
           PhabricatorEnv::getDoclink('User Guide: Account Roles')))
       ->appendChild($buttons)
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->addCancelButton($this->getApplicationURI())
           ->setValue(pht('Continue')));
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb($title);
     $crumbs->setBorder(true);
 
-    $header = id(new PHUIHeaderView())
-      ->setHeader($title)
-      ->setHeaderIcon('fa-user');
-
     $box = id(new PHUIObjectBoxView())
-      ->setHeaderText(pht('User'))
-      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->setHeaderText($title)
+      ->setBackground(PHUIObjectBoxView::WHITE_CONFIG)
       ->setForm($form);
 
     $guidance_context = new PhabricatorPeopleCreateGuidanceContext();
 
     $guidance = id(new PhabricatorGuidanceEngine())
       ->setViewer($admin)
       ->setGuidanceContext($guidance_context)
       ->newInfoView();
 
     $view = id(new PHUITwoColumnView())
-      ->setHeader($header)
       ->setFooter(
         array(
           $guidance,
           $box,
         ));
 
     return $this->newPage()
       ->setTitle($title)
       ->setCrumbs($crumbs)
       ->appendChild($view);
   }
 
 }
diff --git a/src/applications/people/controller/PhabricatorPeopleNewController.php b/src/applications/people/controller/PhabricatorPeopleNewController.php
index 60f9f47b5d..9f52cf567a 100644
--- a/src/applications/people/controller/PhabricatorPeopleNewController.php
+++ b/src/applications/people/controller/PhabricatorPeopleNewController.php
@@ -1,235 +1,230 @@
 <?php
 
 final class PhabricatorPeopleNewController
   extends PhabricatorPeopleController {
 
   public function handleRequest(AphrontRequest $request) {
     $type = $request->getURIData('type');
     $admin = $request->getUser();
 
     $is_bot = false;
     $is_list = false;
     switch ($type) {
       case 'standard':
         $this->requireApplicationCapability(
           PeopleCreateUsersCapability::CAPABILITY);
         break;
       case 'bot':
         $is_bot = true;
         break;
       case 'list':
         $is_list = true;
         break;
       default:
         return new Aphront404Response();
     }
 
     $user = new PhabricatorUser();
     $require_real_name = PhabricatorEnv::getEnvConfig('user.require-real-name');
 
     $e_username = true;
     $e_realname = $require_real_name ? true : null;
     $e_email    = true;
     $errors = array();
 
     $welcome_checked = true;
 
     $new_email = null;
 
     if ($request->isFormPost()) {
       $welcome_checked = $request->getInt('welcome');
 
       $user->setUsername($request->getStr('username'));
 
       $new_email = $request->getStr('email');
       if (!strlen($new_email)) {
         $errors[] = pht('Email is required.');
         $e_email = pht('Required');
       } else if (!PhabricatorUserEmail::isAllowedAddress($new_email)) {
         $e_email = pht('Invalid');
         $errors[] = PhabricatorUserEmail::describeAllowedAddresses();
       } else {
         $e_email = null;
       }
 
       $user->setRealName($request->getStr('realname'));
 
       if (!strlen($user->getUsername())) {
         $errors[] = pht('Username is required.');
         $e_username = pht('Required');
       } else if (!PhabricatorUser::validateUsername($user->getUsername())) {
         $errors[] = PhabricatorUser::describeValidUsername();
         $e_username = pht('Invalid');
       } else {
         $e_username = null;
       }
 
       if (!strlen($user->getRealName()) && $require_real_name) {
         $errors[] = pht('Real name is required.');
         $e_realname = pht('Required');
       } else {
         $e_realname = null;
       }
 
       if (!$errors) {
         try {
 
           $email = id(new PhabricatorUserEmail())
             ->setAddress($new_email)
             ->setIsVerified(0);
 
           // Automatically approve the user, since an admin is creating them.
           $user->setIsApproved(1);
 
           // If the user is a bot or list, approve their email too.
           if ($is_bot || $is_list) {
             $email->setIsVerified(1);
           }
 
           id(new PhabricatorUserEditor())
             ->setActor($admin)
             ->createNewUser($user, $email);
 
           if ($is_bot) {
             id(new PhabricatorUserEditor())
               ->setActor($admin)
               ->makeSystemAgentUser($user, true);
           }
 
           if ($is_list) {
             id(new PhabricatorUserEditor())
               ->setActor($admin)
               ->makeMailingListUser($user, true);
           }
 
           if ($welcome_checked && !$is_bot && !$is_list) {
             $user->sendWelcomeEmail($admin);
           }
 
           $response = id(new AphrontRedirectResponse())
             ->setURI('/p/'.$user->getUsername().'/');
           return $response;
         } catch (AphrontDuplicateKeyQueryException $ex) {
           $errors[] = pht('Username and email must be unique.');
 
           $same_username = id(new PhabricatorUser())
             ->loadOneWhere('username = %s', $user->getUsername());
           $same_email = id(new PhabricatorUserEmail())
             ->loadOneWhere('address = %s', $new_email);
 
           if ($same_username) {
             $e_username = pht('Duplicate');
           }
 
           if ($same_email) {
             $e_email = pht('Duplicate');
           }
         }
       }
     }
 
     $form = id(new AphrontFormView())
       ->setUser($admin);
 
     if ($is_bot) {
+      $title = pht('Create New Bot');
       $form->appendRemarkupInstructions(
         pht('You are creating a new **bot** user account.'));
     } else if ($is_list) {
+      $title = pht('Create New Mailing List');
       $form->appendRemarkupInstructions(
         pht('You are creating a new **mailing list** user account.'));
     } else {
+      $title = pht('Create New User');
       $form->appendRemarkupInstructions(
         pht('You are creating a new **standard** user account.'));
     }
 
     $form
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Username'))
           ->setName('username')
           ->setValue($user->getUsername())
           ->setError($e_username))
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Real Name'))
           ->setName('realname')
           ->setValue($user->getRealName())
           ->setError($e_realname))
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Email'))
           ->setName('email')
           ->setValue($new_email)
           ->setCaption(PhabricatorUserEmail::describeAllowedAddresses())
           ->setError($e_email));
 
     if (!$is_bot && !$is_list) {
       $form->appendChild(
         id(new AphrontFormCheckboxControl())
           ->addCheckbox(
             'welcome',
             1,
             pht('Send "Welcome to Phabricator" email with login instructions.'),
             $welcome_checked));
     }
 
     $form
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->addCancelButton($this->getApplicationURI())
           ->setValue(pht('Create User')));
 
     if ($is_bot) {
       $form
         ->appendChild(id(new AphrontFormDividerControl()))
         ->appendRemarkupInstructions(
           pht(
             '**Why do bot accounts need an email address?**'.
             "\n\n".
             'Although bots do not normally receive email from Phabricator, '.
             'they can interact with other systems which require an email '.
             'address. Examples include:'.
             "\n\n".
             "  - If the account takes actions which //send// email, we need ".
             "    an address to use in the //From// header.\n".
             "  - If the account creates commits, Git and Mercurial require ".
             "    an email address for authorship.\n".
             "  - If you send email //to// Phabricator on behalf of the ".
             "    account, the address can identify the sender.\n".
             "  - Some internal authentication functions depend on accounts ".
             "    having an email address.\n".
             "\n\n".
             "The address will automatically be verified, so you do not need ".
             "to be able to receive mail at this address, and can enter some ".
             "invalid or nonexistent (but correctly formatted) address like ".
             "`bot@yourcompany.com` if you prefer."));
     }
 
-
-    $title = pht('Create New User');
-
     $box = id(new PHUIObjectBoxView())
-      ->setHeaderText(pht('User'))
+      ->setHeaderText($title)
       ->setFormErrors($errors)
-      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->setBackground(PHUIObjectBoxView::WHITE_CONFIG)
       ->setForm($form);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb($title);
     $crumbs->setBorder(true);
 
-    $header = id(new PHUIHeaderView())
-      ->setHeader($title)
-      ->setHeaderIcon('fa-user');
-
     $view = id(new PHUITwoColumnView())
-      ->setHeader($header)
       ->setFooter($box);
 
     return $this->newPage()
       ->setTitle($title)
       ->setCrumbs($crumbs)
       ->appendChild($view);
   }
 
 }