diff --git a/Limelight/ViewControllers/MainFrameViewController.m b/Limelight/ViewControllers/MainFrameViewController.m
index 0b8459f..0e4b006 100644
--- a/Limelight/ViewControllers/MainFrameViewController.m
+++ b/Limelight/ViewControllers/MainFrameViewController.m
@@ -345,8 +345,9 @@ static NSMutableSet* hostList;
                     [self showHostSelectionView];
                 });
             } else {
-                Log(LOG_D, @"server info pair status: %@", [serverInfoResp getStringTag:@"PairStatus"]);
-                if ([[serverInfoResp getStringTag:@"PairStatus"] isEqualToString:@"1"]) {
+                // Update the host object with this data
+                [serverInfoResp populateHost:host];
+                if (host.pairState == PairStatePaired) {
                     Log(LOG_I, @"Already Paired");
                     [self alreadyPaired];
                 }
@@ -545,6 +546,10 @@ static NSMutableSet* hostList;
                                                         // to look like the old error in that case, so the UI behaves.
                                                         quitResponse.statusCode = 599;
                                                     }
+                                                    else if ([serverInfoResp isStatusOk]) {
+                                                        // Update the host object with this info
+                                                        [serverInfoResp populateHost:app.host];
+                                                    }
                                                 }
                                                 [self->_discMan addHostToDiscovery:app.host];