diff --git a/services/users.js b/services/users.js
index b6a5e0404..9b4304e1e 100644
--- a/services/users.js
+++ b/services/users.js
@@ -388,11 +388,11 @@ module.exports = class UsersService {
 
       // User role is not supported! Error out here.
       return Promise.reject(new Error(`role ${role} is not supported`));
-    } else {
+    } else if(role) {
       roles.push(role);
     }
 
-    return UserModel.update({id}, {$set: {roles: [role]}});
+    return UserModel.update({id}, {$set: {roles}});
   }
 
   /**