diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php
index 53dd4ee8711d2..b44d217ea3214 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php
@@ -36,7 +36,7 @@ public function onSubmit(FormEvent $event)
     {
         $data = $event->getData();
 
-        if ($this->defaultProtocol && $data && \is_string($data) && !preg_match('~^[\w+.-]+://~', $data)) {
+        if ($this->defaultProtocol && $data && \is_string($data) && !preg_match('~^([\w+.-]+://|[^:/?@#]++@)~', $data)) {
             $event->setData($this->defaultProtocol.'://'.$data);
         }
     }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/FixUrlProtocolListenerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/FixUrlProtocolListenerTest.php
index e00cb9e9e1978..55fee6e2243ee 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/FixUrlProtocolListenerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/FixUrlProtocolListenerTest.php
@@ -20,45 +20,49 @@
 
 class FixUrlProtocolListenerTest extends TestCase
 {
-    public function testFixHttpUrl()
+    public function provideUrlToFix()
     {
-        $data = 'www.symfony.com';
-        $form = new Form(new FormConfigBuilder('name', null, new EventDispatcher()));
-        $event = new FormEvent($form, $data);
-
-        $filter = new FixUrlProtocolListener('http');
-        $filter->onSubmit($event);
-
-        $this->assertEquals('http://www.symfony.com', $event->getData());
+        return [
+            ['www.symfony.com'],
+            ['twitter.com/@symfony'],
+            ['symfony.com?foo@bar'],
+            ['symfony.com#foo@bar'],
+            ['localhost'],
+        ];
     }
 
-    public function testSkipKnownUrl()
+    /**
+     * @dataProvider provideUrlToFix
+     */
+    public function testFixUrl($data)
     {
-        $data = 'http://www.symfony.com';
         $form = new Form(new FormConfigBuilder('name', null, new EventDispatcher()));
         $event = new FormEvent($form, $data);
 
         $filter = new FixUrlProtocolListener('http');
         $filter->onSubmit($event);
 
-        $this->assertEquals('http://www.symfony.com', $event->getData());
+        $this->assertEquals('http://'.$data, $event->getData());
     }
 
-    public function provideUrlsWithSupportedProtocols()
+    public function provideUrlToSkip()
     {
         return [
+            ['http://www.symfony.com'],
             ['ftp://www.symfony.com'],
+            ['https://twitter.com/@symfony'],
             ['chrome-extension://foo'],
             ['h323://foo'],
             ['iris.beep://foo'],
             ['foo+bar://foo'],
+            ['fabien@symfony.com'],
         ];
     }
 
     /**
-     * @dataProvider provideUrlsWithSupportedProtocols
+     * @dataProvider provideUrlToSkip
      */
-    public function testSkipOtherProtocol($url)
+    public function testSkipUrl($url)
     {
         $form = new Form(new FormConfigBuilder('name', null, new EventDispatcher()));
         $event = new FormEvent($form, $url);