diff --git a/client/src/js/components/UserList.jsx b/client/src/js/components/UserList.jsx
index 06bddff9..a69ae57a 100644
--- a/client/src/js/components/UserList.jsx
+++ b/client/src/js/components/UserList.jsx
@@ -46,13 +46,21 @@ var UserList = React.createClass({
 			});
 		}
 
-		return (
-			<div className="userlist" style={style}>
-				<Infinite containerHeight={this.state.height} elementHeight={24}>
-					{users}
-				</Infinite>
-			</div>
-		);
+		if (users.length !== 1) {
+			return (
+				<div className="userlist" style={style}>
+					<Infinite containerHeight={this.state.height} elementHeight={24}>
+						{users}
+					</Infinite>
+				</div>
+			);
+		} else {
+			return (
+				<div className="userlist" style={style}>
+					<div>{users}</div>
+				</div>
+			);
+		}		
 	}
 });