diff --git a/src/TwilioMessageDriver.php b/src/TwilioMessageDriver.php
index 3e59ced..ca73daa 100644
--- a/src/TwilioMessageDriver.php
+++ b/src/TwilioMessageDriver.php
@@ -45,7 +45,7 @@ public function getConversationAnswer(IncomingMessage $message)
     public function getMessages()
     {
         if (empty($this->messages)) {
-            $message = new IncomingMessage($this->event->get('Body'), $this->event->get('MessageSid'), $this->event->get('To'));
+            $message = new IncomingMessage($this->event->get('Body'), $this->event->get('From'), $this->event->get('To'));
 
             $this->messages = [$message];
         }
diff --git a/tests/TwilioMessageDriverTest.php b/tests/TwilioMessageDriverTest.php
index 311eb4b..450b63a 100644
--- a/tests/TwilioMessageDriverTest.php
+++ b/tests/TwilioMessageDriverTest.php
@@ -108,7 +108,7 @@ public function it_detects_bots()
     public function it_returns_the_user_id()
     {
         $driver = $this->getValidDriver();
-        $this->assertSame('CA69d45cb4f204d9e790f24e0151e90fa9', $driver->getMessages()[0]->getSender());
+        $this->assertSame('+431234567890', $driver->getMessages()[0]->getSender());
     }
 
     /** @test */
@@ -126,7 +126,7 @@ public function it_returns_the_user_object()
         $message = $driver->getMessages()[0];
         $user = $driver->getUser($message);
 
-        $this->assertSame($user->getId(), 'CA69d45cb4f204d9e790f24e0151e90fa9');
+        $this->assertSame($user->getId(), '+431234567890');
         $this->assertNull($user->getFirstName());
         $this->assertNull($user->getLastName());
         $this->assertNull($user->getUsername());