diff --git a/plexpy/http_handler.py b/plexpy/http_handler.py
index f9da4a28..74e1e22d 100644
--- a/plexpy/http_handler.py
+++ b/plexpy/http_handler.py
@@ -72,16 +72,16 @@ class HTTPHandler(object):
 
             token_string = ''
             if not no_token:
-                if uri.find('?') > 0:
-                    token_string = '&X-Plex-Token=' + self.token
+                if headers:
+                    headers.update({'X-Plex-Token': self.token})
                 else:
-                    token_string = '?X-Plex-Token=' + self.token
+                    headers = {'X-Plex-Token': self.token}
 
             try:
                 if headers:
-                    handler.request(request_type, uri + token_string, headers=headers)
+                    handler.request(request_type, uri, headers=headers)
                 else:
-                    handler.request(request_type, uri + token_string)
+                    handler.request(request_type, uri)
                 response = handler.getresponse()
                 request_status = response.status
                 request_content = response.read()
diff --git a/plexpy/web_socket.py b/plexpy/web_socket.py
index 57b202ac..89d7f64d 100644
--- a/plexpy/web_socket.py
+++ b/plexpy/web_socket.py
@@ -58,7 +58,9 @@ def run():
 
     # Set authentication token (if one is available)
     if plexpy.CONFIG.PMS_TOKEN:
-        uri += '?X-Plex-Token=' + plexpy.CONFIG.PMS_TOKEN
+        header = ["X-Plex-Token: %s" % plexpy.CONFIG.PMS_TOKEN]
+    else:
+        header = []
 
     global ws_reconnect
     ws_reconnect = False
@@ -69,7 +71,7 @@ def run():
     while not ws_connected and reconnects <= 15:
         try:
             logger.info(u"PlexPy WebSocket :: Opening%s websocket, connection attempt %s." % (secure, str(reconnects + 1)))
-            ws = create_connection(uri)
+            ws = create_connection(uri, header=header)
             reconnects = 0
             ws_connected = True
             logger.info(u"PlexPy WebSocket :: Ready")
@@ -94,7 +96,7 @@ def run():
 
                 logger.warn(u"PlexPy WebSocket :: Connection has closed, reconnecting...")
                 try:
-                    ws = create_connection(uri)
+                    ws = create_connection(uri, header=header)
                 except IOError, e:
                     logger.info(u"PlexPy WebSocket :: %s." % e)