diff --git a/src/applications/conduit/method/user/base/ConduitAPI_user_Method.php b/src/applications/conduit/method/user/base/ConduitAPI_user_Method.php
index 3c32e7ee5f..c2f4ec0e81 100644
--- a/src/applications/conduit/method/user/base/ConduitAPI_user_Method.php
+++ b/src/applications/conduit/method/user/base/ConduitAPI_user_Method.php
@@ -25,12 +25,24 @@ abstract class ConduitAPI_user_Method extends ConduitAPIMethod {
     PhabricatorUser $user,
     PhabricatorUserStatus $current_status = null) {
 
+    $roles = array();
+    if ($user->getIsDisabled()) {
+      $roles[] = 'disabled';
+    }
+    if ($user->getIsSystemAgent()) {
+      $roles[] = 'agent';
+    }
+    if ($user->getIsAdmin()) {
+      $roles[] = 'admin';
+    }
+
     $return = array(
       'phid'      => $user->getPHID(),
       'userName'  => $user->getUserName(),
       'realName'  => $user->getRealName(),
       'image'     => $user->loadProfileImageURI(),
       'uri'       => PhabricatorEnv::getURI('/p/'.$user->getUsername().'/'),
+      'roles'     => $roles,
     );
 
     if ($current_status) {
diff --git a/src/applications/conduit/method/user/info/ConduitAPI_user_info_Method.php b/src/applications/conduit/method/user/info/ConduitAPI_user_info_Method.php
index 8f2c444ff4..323183867f 100644
--- a/src/applications/conduit/method/user/info/ConduitAPI_user_info_Method.php
+++ b/src/applications/conduit/method/user/info/ConduitAPI_user_info_Method.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,14 @@
 final class ConduitAPI_user_info_Method
   extends ConduitAPI_user_Method {
 
+  public function getMethodStatus() {
+    return self::METHOD_STATUS_DEPRECATED;
+  }
+
+  public function getMethodStatusDescription() {
+    return "Replaced by 'user.query'.";
+  }
+
   public function getMethodDescription() {
     return "Retrieve information about a user by PHID.";
   }