diff --git a/changes.json b/changes.json
index e3a529a75..16492eb2c 100644
--- a/changes.json
+++ b/changes.json
@@ -1,9 +1,10 @@
 {
-  "date": "April 3, 2017",
+  "date": "April 4, 2017",
   "updated": [
     "Some improvements to todo module",
     "Some fixes to pagination",
-    "Some improvements"
+    "Some improvements",
+    "Improved `sweep` command"
   ],
   "added": [
     "`addSelfAssignableRoles` command",
diff --git a/modules/queries/sweep.js b/modules/queries/sweep.js
index 18b153d66..5ef003ca6 100644
--- a/modules/queries/sweep.js
+++ b/modules/queries/sweep.js
@@ -20,9 +20,7 @@
  */
 
 exports.run = (Bastion, message, args) => {
-  let members = message.channel.members.filter(m => !m.user.bot).map(m => m.user.id);
-  let sweepedUserId = members[Math.floor(Math.random()*members.length)];
-  let sweepedUser = message.channel.members.get(sweepedUserId).user;
+  let sweepedUser = message.channel.members.filter(m => !m.user.bot).random();
 
   message.channel.sendMessage('', {embed: {
     color: 6651610,
@@ -30,12 +28,12 @@ exports.run = (Bastion, message, args) => {
     fields: [
       {
         name: 'User',
-        value: `**${sweepedUser.username}**#${sweepedUser.discriminator}`,
+        value: `**${sweepedUser.user.username}**#${sweepedUser.user.discriminator}`,
         inline: true
       },
       {
         name: 'ID',
-        value: sweepedUserId,
+        value: sweepedUser.id,
         inline: true
       }
     ]
@@ -50,7 +48,7 @@ exports.config = {
 
 exports.help = {
   name: 'sweep',
-  description: 'Shows a random user from the server.',
+  description: 'Shows a random user from the channel.',
   permission: '',
   usage: 'sweep',
   example: []