diff --git a/src/applications/conduit/method/user/ConduitAPI_user_Method.php b/src/applications/conduit/method/user/ConduitAPI_user_Method.php
index c2f4ec0e81..7a1080b14c 100644
--- a/src/applications/conduit/method/user/ConduitAPI_user_Method.php
+++ b/src/applications/conduit/method/user/ConduitAPI_user_Method.php
@@ -36,6 +36,13 @@ abstract class ConduitAPI_user_Method extends ConduitAPIMethod {
       $roles[] = 'admin';
     }
 
+    $primary = $user->loadPrimaryEmail();
+    if ($primary && $primary->getIsVerified()) {
+      $roles[] = 'verified';
+    } else {
+      $roles[] = 'unverified';
+    }
+
     $return = array(
       'phid'      => $user->getPHID(),
       'userName'  => $user->getUserName(),
diff --git a/src/applications/conduit/method/user/ConduitAPI_user_query_Method.php b/src/applications/conduit/method/user/ConduitAPI_user_query_Method.php
index 0018670bf9..f62ef4a8c6 100644
--- a/src/applications/conduit/method/user/ConduitAPI_user_query_Method.php
+++ b/src/applications/conduit/method/user/ConduitAPI_user_query_Method.php
@@ -64,8 +64,6 @@ final class ConduitAPI_user_query_Method
       $query->withUsernames($usernames);
     }
     if ($emails) {
-      // TODO -- validate emails and maybe
-      // throw new ConduitException('ERR-INVALID-PARAMETER');
       $query->withEmails($emails);
     }
     if ($realnames) {