diff --git a/quassel-for-ios/quassel-for-ios/IPhoneStoryboard.storyboard b/quassel-for-ios/quassel-for-ios/IPhoneStoryboard.storyboard
index f2a7163..57b95de 100644
--- a/quassel-for-ios/quassel-for-ios/IPhoneStoryboard.storyboard
+++ b/quassel-for-ios/quassel-for-ios/IPhoneStoryboard.storyboard
@@ -265,7 +265,7 @@
                     </tableView>
                     <extendedEdge key="edgesForExtendedLayout"/>
                     <navigationItem key="navigationItem" id="B8F-mc-89Z">
-                        <barButtonItem key="rightBarButtonItem" title="Users" id="lWU-an-Et9">
+                        <barButtonItem key="rightBarButtonItem" title="⚙️" id="lWU-an-Et9">
                             <connections>
                                 <segue destination="O1u-ym-bjs" kind="modal" identifier="ShowUserListSegue" id="zHr-w1-MmX"/>
                             </connections>
diff --git a/quassel-for-ios/quassel-for-ios/vcs/BufferViewController.m b/quassel-for-ios/quassel-for-ios/vcs/BufferViewController.m
index 5fa73b3..64f9afe 100644
--- a/quassel-for-ios/quassel-for-ios/vcs/BufferViewController.m
+++ b/quassel-for-ios/quassel-for-ios/vcs/BufferViewController.m
@@ -365,11 +365,11 @@ - (void) setCurrentBufferId:(BufferId*)bI
         //self.inputTextField.hidden = FALSE;
     }
 
-    if (self.bufferType == ChannelBuffer) {
+    //if (self.bufferType == ChannelBuffer) {
         self.navigationItem.rightBarButtonItem = userListButton;
-    }else {
-        self.navigationItem.rightBarButtonItem = nil;
-    }
+    //}else {
+    //    self.navigationItem.rightBarButtonItem = nil;
+    //}
 }
 
 - (BufferId*) currentBufferId
@@ -847,7 +847,11 @@ - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender
             userListTableViewControllerPopoverController = nil;
             userListTableViewController = ultvc;
         }
-        ultvc.nicks = [quasselCoreConnection ircUsersForChannelWithBufferId:bufferId];
+        if (self.bufferType == ChannelBuffer) {
+            ultvc.nicks = [quasselCoreConnection ircUsersForChannelWithBufferId:bufferId];
+        } else {
+            ultvc.nicks = @[];
+        }
         ultvc.callbackObject = self;
         ultvc.callbackSelector = @selector(userListUserPressed:);