diff --git a/IRCCloud/Classes/EventsTableView.m b/IRCCloud/Classes/EventsTableView.m
index 73d621360..26e6b8332 100644
--- a/IRCCloud/Classes/EventsTableView.m
+++ b/IRCCloud/Classes/EventsTableView.m
@@ -2126,7 +2126,6 @@ - (void)refresh {
         } else {
             self->_tableView.tableHeaderView = nil;
         }
-        
         if(_earliestEid == _buffer.min_eid)
             self->_shouldAutoFetch = NO;
         
@@ -3160,6 +3159,11 @@ -(void)scrollViewDidScroll:(UIScrollView *)scrollView {
             self->_hiddenAvatarRow = -1;
         }
     }
+#ifdef DEBUG
+    if([[NSProcessInfo processInfo].arguments containsObject:@"-ui_testing"]) {
+        self->_tableView.tableHeaderView = nil;
+    }
+#endif
 }
 
 -(void)_replyButtonPressed:(UIControl *)sender {
diff --git a/IRCCloud/Classes/MainViewController.m b/IRCCloud/Classes/MainViewController.m
index 05f3a876c..f5bcc281b 100644
--- a/IRCCloud/Classes/MainViewController.m
+++ b/IRCCloud/Classes/MainViewController.m
@@ -3667,6 +3667,7 @@ -(void)rowSelected:(Event *)event {
                 self->_selectedUser.nick = event.fromNick;
                 self->_selectedUser.display_name = event.from;
                 self->_selectedUser.hostmask = event.hostmask;
+                self->_selectedUser.parted = YES;
             }
             [self _mention];
         }
@@ -4956,7 +4957,8 @@ -(void)actionSheetActionClicked:(NSString *)action {
             else
                 [[NetworkConnection sharedInstance] whois:self->_selectedUser.nick server:self->_selectedUser.ircserver.length?_selectedUser.ircserver:self->_selectedUser.nick cid:self->_buffer.cid handler:nil];
         } else if([self->_buffer.type isEqualToString:@"conversation"]) {
-            [[NetworkConnection sharedInstance] whois:self->_buffer.name server:self->_buffer.name cid:self->_buffer.cid handler:nil];
+            User *u = [[UsersDataSource sharedInstance] getUser:self->_buffer.name cid:self->_buffer.cid];
+            [[NetworkConnection sharedInstance] whois:self->_buffer.name server:u.ircserver.length?u.ircserver:nil cid:self->_buffer.cid handler:nil];
         }
     } else if([action isEqualToString:@"Send Feedback"]) {
         CLS_LOG(@"Feedback Requested");
diff --git a/build-scripts/BUILD b/build-scripts/BUILD
index b2412e34d..4b6f9c39e 100644
--- a/build-scripts/BUILD
+++ b/build-scripts/BUILD
@@ -1 +1 @@
-62
\ No newline at end of file
+64
\ No newline at end of file