diff --git a/src/rumchat_actor/__init__.py b/src/rumchat_actor/__init__.py
index 614d54d..bbca69e 100644
--- a/src/rumchat_actor/__init__.py
+++ b/src/rumchat_actor/__init__.py
@@ -194,7 +194,7 @@ def __init__(self, stream_id = None, init_message = "Hello, Rumble world!", prof
             if username and password:
                 sign_in_buttn.click()
                 WebDriverWait(self.browser, BROWSER_WAIT_TIMEOUT).until(
-                    EC.visibility_of_element_located(By.ID, "login-username"),
+                    EC.visibility_of_element_located((By.ID, "login-username")),
                     "Timed out waiting for sign-in dialouge"
                     )
 
@@ -208,14 +208,10 @@ def __init__(self, stream_id = None, init_message = "Hello, Rumble world!", prof
 
         #Wait for signed in loading to complete
         WebDriverWait(self.browser, BROWSER_WAIT_TIMEOUT).until(
-            EC.invisibility_of_element(uname_field),
-            "Timeout waiting for username field to disappear"
+            EC.element_to_be_clickable((By.ID, "chat-message-text-input")),
+            "Timed out waiting for chat message field to become usable"
             )
 
-        WebDriverWait(self.browser, BROWSER_WAIT_TIMEOUT).until(
-            EC.visibility_of_element_located(By.ID, "chat-message-text-input"),
-            "Timed out waiting for chat message field to appear"
-            )
 
         #Find our username
         if username: