diff --git a/skins/base/views/molecules/UserSelector.js b/skins/base/views/molecules/UserSelector.js
index 81afa5f4e6..8ec0086670 100644
--- a/skins/base/views/molecules/UserSelector.js
+++ b/skins/base/views/molecules/UserSelector.js
@@ -26,17 +26,19 @@ module.exports = React.createClass({
 
     onAddUserId: function() {
         this.addUser(this.refs.user_id_input.getDOMNode().value);
+        this.refs.user_id_input.getDOMNode().value = "";
     },
 
     render: function() {
+        var self = this;
         return (
             <div>
                 <ul className="mx_UserSelector_UserIdList" ref="list">
                     {this.props.selected_users.map(function(user_id, i) {
-                        return <li key={user_id}>{user_id}</li>
+                        return <li key={user_id}>{user_id} - <span onClick={function() {self.removeUser(user_id);}}>X</span></li>
                     })}
                 </ul>
-                <input type="text" ref="user_id_input" className="mx_UserSelector_userIdInput" placeholder="ex. @bob:example.com"/>
+                <input type="text" ref="user_id_input" defaultValue="" className="mx_UserSelector_userIdInput" placeholder="ex. @bob:example.com"/>
                 <button onClick={this.onAddUserId} className="mx_UserSelector_AddUserId">Add User</button>
             </div>
         );
diff --git a/src/controllers/molecules/UserSelector.js b/src/controllers/molecules/UserSelector.js
index b3a604402a..67a56163fa 100644
--- a/src/controllers/molecules/UserSelector.js
+++ b/src/controllers/molecules/UserSelector.js
@@ -38,7 +38,7 @@ module.exports = {
     },
 
     removeUser: function(user_id) {
-        this.props.onChange(this.state.selected_users.filter(function(e) {
+        this.props.onChange(this.props.selected_users.filter(function(e) {
             return e != user_id;
         }));
     },