diff --git a/Controller/ProfileManager.php b/Controller/ProfileManager.php
index c5a468e..6e4ed19 100644
--- a/Controller/ProfileManager.php
+++ b/Controller/ProfileManager.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace PUGX\MultiUserBundle\Controller;
 
 use FOS\UserBundle\Controller\ProfileController;
@@ -30,10 +31,10 @@ class ProfileManager
     protected $formFactory;
 
     /**
-     * @param UserDiscriminator $userDiscriminator
+     * @param UserDiscriminator  $userDiscriminator
      * @param ContainerInterface $container
-     * @param ProfileController $controller
-     * @param FormFactory $formFactory
+     * @param ProfileController  $controller
+     * @param FormFactory        $formFactory
      */
     public function __construct(
         UserDiscriminator $userDiscriminator,
@@ -49,16 +50,17 @@ public function __construct(
 
     /**
      * @param string $class
+     *
      * @return RedirectResponse
      */
-    public function edit($class)
+    public function edit($class, $templates = array())
     {
         $this->userDiscriminator->setClass($class);
 
         $this->controller->setContainer($this->container);
         $result = $this->controller->editAction($this->container->get('request'));
         if ($result instanceof RedirectResponse) {
-            return $this->controller->redirect($this->controller->get('request')->getRequestUri());
+            return $result;
         }
 
         $template = $this->userDiscriminator->getTemplate('profile');
@@ -67,8 +69,11 @@ public function edit($class)
         }
 
         $form = $this->formFactory->createForm();
-        return $this->container->get('templating')->renderResponse($template, array(
-            'form' => $form->createView(),
+
+        return $this->container->get('templating')->renderResponse($template,
+                array(
+                'form' => $form->createView(),
+                'templates' => $templates,
         ));
     }
 }
diff --git a/Controller/RegistrationManager.php b/Controller/RegistrationManager.php
index 0f98da2..97227e6 100644
--- a/Controller/RegistrationManager.php
+++ b/Controller/RegistrationManager.php
@@ -11,38 +11,33 @@
 class RegistrationManager
 {
     /**
-     *
-     * @var \PUGX\MultiUserBundle\Model\UserDiscriminator 
+     * @var \PUGX\MultiUserBundle\Model\UserDiscriminator
      */
     protected $userDiscriminator;
-    
+
     /**
-     *
-     * @var \Symfony\Component\DependencyInjection\ContainerInterface 
+     * @var \Symfony\Component\DependencyInjection\ContainerInterface
      */
     protected $container;
-    
+
     /**
-     *
-     * @var \FOS\UserBundle\Controller\RegistrationController 
+     * @var \FOS\UserBundle\Controller\RegistrationController
      */
     protected $controller;
-    
+
     /**
-     *
      * @var \PUGX\MultiUserBundle\Form\FormFactory
      */
     protected $formFactory;
-        
+
     /**
-     * 
-     * @param \PUGX\MultiUserBundle\Model\UserDiscriminator $userDiscriminator
+     * @param \PUGX\MultiUserBundle\Model\UserDiscriminator             $userDiscriminator
      * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
-     * @param \FOS\UserBundle\Controller\RegistrationController $controller
-     * @param \PUGX\MultiUserBundle\Form\FormFactory $formFactory
+     * @param \FOS\UserBundle\Controller\RegistrationController         $controller
+     * @param \PUGX\MultiUserBundle\Form\FormFactory                    $formFactory
      */
     public function __construct(UserDiscriminator $userDiscriminator,
-                                ContainerInterface $container, 
+                                ContainerInterface $container,
                                 RegistrationController $controller,
                                 FormFactory $formFactory)
     {
@@ -51,30 +46,32 @@ public function __construct(UserDiscriminator $userDiscriminator,
         $this->controller = $controller;
         $this->formFactory = $formFactory;
     }
-    
+
     /**
-     * 
      * @param string $class
+     *
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
-    public function register($class)
+    public function register($class, $templates = array())
     {
         $this->userDiscriminator->setClass($class);
-        
+
         $this->controller->setContainer($this->container);
-        $result = $this->controller->registerAction($this->container->get('request'));        
+        $result = $this->controller->registerAction($this->container->get('request'));
         if ($result instanceof RedirectResponse) {
             return $result;
         }
-        
+
         $template = $this->userDiscriminator->getTemplate('registration');
         if (is_null($template)) {
             $template = 'FOSUserBundle:Registration:register.html.twig';
         }
-        
-        $form = $this->formFactory->createForm();      
+
+        $form = $this->formFactory->createForm();
+
         return $this->container->get('templating')->renderResponse($template, array(
             'form' => $form->createView(),
+            'templates' => $templates,
         ));
     }
 }
diff --git a/DependencyInjection/Compiler/OverrideServiceCompilerPass.php b/DependencyInjection/Compiler/OverrideServiceCompilerPass.php
index 8b78156..56cf3a9 100644
--- a/DependencyInjection/Compiler/OverrideServiceCompilerPass.php
+++ b/DependencyInjection/Compiler/OverrideServiceCompilerPass.php
@@ -18,6 +18,16 @@ public function process(ContainerBuilder $container)
                 $container, 
                 'fos_user.profile.form.factory', 
                 'pugx_multi_user.profile_form_factory');
+
+        $this->changeService(
+                $container,
+                'fos_user.registration.form.type',
+                'pugx_multi_user.registration.form.type');
+
+        $this->changeService(
+                $container,
+                'fos_user.profile.form.type',
+                'pugx_multi_user.profile.form.type');
     }
     
     private function changeService($container, $serviceName, $newServiceName)
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 1c7a2f3..c23f273 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -81,7 +81,11 @@ public function getConfigTreeBuilder()
                                  ->end()
                             ->end()
                         ->end()
-                        
+                        ->children()
+                            ->arrayNode('options')
+                                ->prototype('scalar')->defaultValue(null)->end()
+                            ->end()
+                        ->end()
                     ->end()
                 ->end()
                 ->end();
diff --git a/Form/ProfileFormType.php b/Form/ProfileFormType.php
new file mode 100644
index 0000000..cf27202
--- /dev/null
+++ b/Form/ProfileFormType.php
@@ -0,0 +1,78 @@
+<?php
+
+/*
+ * This file is part of the FOSUserBundle package.
+ *
+ * (c) FriendsOfSymfony <http://friendsofsymfony.github.com/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace PUGX\MultiUserBundle\Form;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\Security\Core\Validator\Constraints\UserPassword;
+
+class ProfileFormType extends AbstractType
+{
+    protected $class;
+    protected $options;
+
+    /**
+     * @param string $class The User class name
+     */
+    public function __construct($class, $options = null)
+    {
+        $this->class = $class;
+        $this->options = $options;
+    }
+
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $this->buildUserForm($builder, $options);
+
+        $builder->add('current_password', 'password', array(
+            'label' => 'form.current_password',
+            'translation_domain' => 'FOSUserBundle',
+            'mapped' => false,
+            'constraints' => new UserPassword(),
+        ));
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults(array(
+            'data_class' => $this->class,
+            'intention' => 'profile',
+        ));
+    }
+
+    // BC for SF < 2.7
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $this->configureOptions($resolver);
+    }
+
+    public function getName()
+    {
+        return 'fos_user_profile';
+    }
+
+    /**
+     * Builds the embedded form representing the user.
+     *
+     * @param FormBuilderInterface $builder
+     * @param array                $options
+     */
+    protected function buildUserForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('username', null, array('label' => 'form.username', 'translation_domain' => 'FOSUserBundle'))
+            ->add('email', 'email', array('label' => 'form.email', 'translation_domain' => 'FOSUserBundle'))
+        ;
+    }
+}
diff --git a/Form/RegistrationFormType.php b/Form/RegistrationFormType.php
new file mode 100644
index 0000000..cab7d61
--- /dev/null
+++ b/Form/RegistrationFormType.php
@@ -0,0 +1,68 @@
+<?php
+
+/*
+ * This file is part of the FOSUserBundle package.
+ *
+ * (c) FriendsOfSymfony <http://friendsofsymfony.github.com/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace PUGX\MultiUserBundle\Form;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+
+class RegistrationFormType extends AbstractType
+{
+    private $class;
+    protected $options;
+
+    /**
+     * @param string $class The User class name
+     */
+    public function __construct($class, $options = null)
+    {
+        $this->class = $class;
+        $this->options = $options;
+    }
+
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('email', 'email', array('label' => 'form.email', 'translation_domain' => 'FOSUserBundle'))
+            ->add('username', null, array('label' => 'form.username', 'translation_domain' => 'FOSUserBundle'))
+            ->add('plainPassword', 'repeated', array(
+                'type' => 'password',
+                'options' => array('translation_domain' => 'FOSUserBundle'),
+                'first_options' => array('label' => 'form.password'),
+                'second_options' => array('label' => 'form.password_confirmation'),
+                'invalid_message' => 'fos_user.password.mismatch',
+            ))
+        ;
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults(array(
+            'data_class' => $this->class,
+            'intention'  => 'registration',
+        ));
+    }
+
+    // BC for SF < 2.7
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $this->configureOptions($resolver);
+    }
+
+    public function getName()
+    {
+        return 'fos_user_registration';
+    }
+
+
+}
diff --git a/Model/UserDiscriminator.php b/Model/UserDiscriminator.php
index 3cd1b3f..94035ea 100644
--- a/Model/UserDiscriminator.php
+++ b/Model/UserDiscriminator.php
@@ -71,7 +71,7 @@ public function getClasses()
         foreach ($this->conf as $entity => $conf) {
             $classes[] = $entity;
         }
-        
+
         return $classes;
     }
         
@@ -136,6 +136,18 @@ public function getUserFactory()
     {
         return $this->conf[$this->getClass()]['factory'];
     }
+
+    /**
+     *
+     * @return array
+     */
+    public function getUserOptions()
+    {
+        $class = $this->getClass();
+        $options = $this->conf[$class]['options'];
+
+        return $options;
+    }
     
     /**
      * 
@@ -147,13 +159,13 @@ public function getFormType($name)
     {
         $class = $this->getClass();
         $className = $this->conf[$class][$name]['form']['type'];
+        $options = $this->conf[$class]['options'];
         
         if (!class_exists($className)) {
             throw new \InvalidArgumentException(sprintf('UserDiscriminator, error getting form type : "%s" not found', $className));
         }
 
-        $type = new $className($class);
-        
+        $type = new $className($class, $options);
         return $type;
     }
     
@@ -185,7 +197,7 @@ public function getTemplate($name)
     {
         return $this->conf[$this->getClass()][$name]['template'];
     }
-    
+
     /**
      *
      * @param array $entities
@@ -219,7 +231,8 @@ protected function buildConfig(array $users)
                             'validation_groups' => $user['profile']['form']['validation_groups'],
                         ),
                         'template' => $user['profile']['template'],
-                    )
+                    ),
+                    'options' => $user['options']
                 );
         }
     }
diff --git a/Resources/config/services.yml b/Resources/config/services.yml
index fb5ec4f..89bc7c3 100644
--- a/Resources/config/services.yml
+++ b/Resources/config/services.yml
@@ -47,4 +47,15 @@ services:
     # alias
     pugx_user_discriminator:
         alias: pugx_user.manager.user_discriminator
-    
+
+    pugx_multi_user.registration.form.type:
+        class: PUGX\MultiUserBundle\Form\RegistrationFormType
+        arguments: [%fos_user.model.user.class%]
+        tags:
+            - { name: form.type, alias: fos_user_registration }        
+
+    pugx_multi_user.profile.form.type:
+        class: PUGX\MultiUserBundle\Form\ProfileFormType
+        arguments: [%fos_user.model.user.class%]
+        tags:
+            - { name: form.type, alias: fos_user_profile }        
diff --git a/Resources/doc/index.md b/Resources/doc/index.md
index 75df871..8538383 100644
--- a/Resources/doc/index.md
+++ b/Resources/doc/index.md
@@ -1,7 +1,7 @@
 PUGXMultiUserBundle Documentation
 ==================================
 
-PUGXMultiUserBundle came by the need to use different types of users using only one fos_user service.
+PUGXMultiUserBundle came by the need to have users with different attributes using only one fos_user service.
 In practice it is an hack that forces FOSUser bundle through custom UserManager, controllers, and forms handlers.
 
 It's just a lazy way to use for free most of the functionality of FOSUserBundle.
@@ -23,7 +23,8 @@ This version of the bundle requires Symfony dev-master and FOSUserBundle dev-mas
 4. Configure the FOSUserBundle (PUGXMultiUserBundle params)
 5. Configure parameters for UserDiscriminator
 6. Create your controllers
-7. Using the User Manager
+7. Overriding forms
+8. Using the User Manager
 
 
 ### 1. Download PUGXMultiUserBundle
@@ -33,19 +34,19 @@ This version of the bundle requires Symfony dev-master and FOSUserBundle dev-mas
 Add the following lines in your composer.json:
 
 ```
-{
-    "require": {
-        "friendsofsymfony/user-bundle": "2.0.*@dev",
-        "pugx/multi-user-bundle": "3.0.*@dev"
+    {
+        "require": {
+            "friendsofsymfony/user-bundle": "2.0.*@dev",
+            "pugx/multi-user-bundle": "3.0.*@dev"
+        }
     }
-}
 
 ```
 
 Now, run the composer to download the bundle:
 
 ``` bash
-$ php composer.phar update pugx/multi-user-bundle
+    $ php composer.phar update pugx/multi-user-bundle
 ```
 
 
@@ -54,17 +55,17 @@ $ php composer.phar update pugx/multi-user-bundle
 Enable the bundles in the kernel:
 
 ``` php
-<?php
-// app/AppKernel.php
-
-public function registerBundles()
-{
-    $bundles = array(
-        // ...
-        new PUGX\MultiUserBundle\PUGXMultiUserBundle(),
-        new FOS\UserBundle\FOSUserBundle(),
-    );
-}
+    <?php
+    // app/AppKernel.php
+    
+    public function registerBundles()
+    {
+        $bundles = array(
+            // ...
+            new PUGX\MultiUserBundle\PUGXMultiUserBundle(),
+            new FOS\UserBundle\FOSUserBundle(),
+        );
+    }
 ```
 
 ### 3. Create your Entities
@@ -74,84 +75,84 @@ Create entities using Doctrine2 inheritance.
 Abstract User that directly extends the model FOS\UserBundle\Model\User
 
 ``` php
-<?php
-
-namespace Acme\UserBundle\Entity;
-
-use Doctrine\ORM\Mapping as ORM;
-use FOS\UserBundle\Model\User as BaseUser;
-
-/**
- * @ORM\Entity
- * @ORM\Table(name="user")
- * @ORM\InheritanceType("JOINED")
- * @ORM\DiscriminatorColumn(name="type", type="string")
- * @ORM\DiscriminatorMap({"user_one" = "UserOne", "user_two" = "UserTwo"})
- *
- */
-abstract class User extends BaseUser
-{
+    <?php
+    
+    namespace Acme\UserBundle\Entity;
+    
+    use Doctrine\ORM\Mapping as ORM;
+    use FOS\UserBundle\Model\User as BaseUser;
+    
     /**
-     * @ORM\Id
-     * @ORM\Column(type="integer")
-     * @ORM\GeneratedValue(strategy="AUTO")
+     * @ORM\Entity
+     * @ORM\Table(name="user")
+     * @ORM\InheritanceType("JOINED")
+     * @ORM\DiscriminatorColumn(name="type", type="string")
+     * @ORM\DiscriminatorMap({"user_one" = "UserOne", "user_two" = "UserTwo"})
+     *
      */
-    protected $id;
-}
+    abstract class User extends BaseUser
+    {
+        /**
+         * @ORM\Id
+         * @ORM\Column(type="integer")
+         * @ORM\GeneratedValue(strategy="AUTO")
+         */
+        protected $id;
+    }
 ```
 
 UserOne
 
 ``` php
-<?php
-
-namespace Acme\UserBundle\Entity;
-
-use Doctrine\ORM\Mapping as ORM;
-use PUGX\MultiUserBundle\Validator\Constraints\UniqueEntity;
-
-/**
- * @ORM\Entity
- * @ORM\Table(name="user_one")
- * @UniqueEntity(fields = "username", targetClass = "Acme\UserBundle\Entity\User", message="fos_user.username.already_used")
- * @UniqueEntity(fields = "email", targetClass = "Acme\UserBundle\Entity\User", message="fos_user.email.already_used")
- */
-class UserOne extends User
-{
+    <?php
+    
+    namespace Acme\UserBundle\Entity;
+    
+    use Doctrine\ORM\Mapping as ORM;
+    use PUGX\MultiUserBundle\Validator\Constraints\UniqueEntity;
+    
     /**
-     * @ORM\Id
-     * @ORM\Column(type="integer")
-     * @ORM\GeneratedValue(strategy="AUTO")
+     * @ORM\Entity
+     * @ORM\Table(name="user_one")
+     * @UniqueEntity(fields = "username", targetClass = "Acme\UserBundle\Entity\User", message="fos_user.username.already_used")
+     * @UniqueEntity(fields = "email", targetClass = "Acme\UserBundle\Entity\User", message="fos_user.email.already_used")
      */
-    protected $id;
-}
+    class UserOne extends User
+    {
+        /**
+         * @ORM\Id
+         * @ORM\Column(type="integer")
+         * @ORM\GeneratedValue(strategy="AUTO")
+         */
+        protected $id;
+    }
 ```
 
 UserTwo
 
 ``` php
-<?php
-
-namespace Acme\UserBundle\Entity;
-
-use Doctrine\ORM\Mapping as ORM;
-use PUGX\MultiUserBundle\Validator\Constraints\UniqueEntity;
-
-/**
- * @ORM\Entity
- * @ORM\Table(name="user_two")
- * @UniqueEntity(fields = "username", targetClass = "Acme\UserBundle\Entity\User", message="fos_user.username.already_used")
- * @UniqueEntity(fields = "email", targetClass = "Acme\UserBundle\Entity\User", message="fos_user.email.already_used")
- */
-class UserTwo extends User
-{
+    <?php
+    
+    namespace Acme\UserBundle\Entity;
+    
+    use Doctrine\ORM\Mapping as ORM;
+    use PUGX\MultiUserBundle\Validator\Constraints\UniqueEntity;
+    
     /**
-     * @ORM\Id
-     * @ORM\Column(type="integer")
-     * @ORM\GeneratedValue(strategy="AUTO")
+     * @ORM\Entity
+     * @ORM\Table(name="user_two")
+     * @UniqueEntity(fields = "username", targetClass = "Acme\UserBundle\Entity\User", message="fos_user.username.already_used")
+     * @UniqueEntity(fields = "email", targetClass = "Acme\UserBundle\Entity\User", message="fos_user.email.already_used")
      */
-    protected $id;
-}
+    class UserTwo extends User
+    {
+        /**
+         * @ORM\Id
+         * @ORM\Column(type="integer")
+         * @ORM\GeneratedValue(strategy="AUTO")
+         */
+        protected $id;
+    }
 ```
 
 You must also create forms for your entities:
@@ -164,13 +165,13 @@ but it does it only in controllers and forms handlers; in the other cases (comma
 it still uses the user_class configured in the config.
 
 ``` yaml
-# Acme/UserBundle/Resources/config/config.yml
-fos_user:
-    db_driver: orm
-    firewall_name: main
-    user_class: Acme\UserBundle\Entity\User
-    service:
-        user_manager: pugx_user_manager
+    # Acme/UserBundle/Resources/config/config.yml
+    fos_user:
+        db_driver: orm
+        firewall_name: main
+        user_class: Acme\UserBundle\Entity\User
+        service:
+            user_manager: pugx_user_manager
 ```
 
 **Note:**
@@ -179,36 +180,42 @@ In fact is the discriminator that has responsibility to get the user class depen
 
 ### 5. Configure the PUGXMultiUserBundle
 
-``` yaml
-# Acme/UserBundle/Resources/config/config.yml
-
-pugx_multi_user:
-  users:
-    user_one:
-        entity: 
-          class: Acme\UserBundle\Entity\UserOne
-#          factory: 
-        registration:
-          form: 
-            type: Acme\UserBundle\Form\Type\RegistrationUserOneFormType
-            name: fos_user_registration_form
-            validation_groups:  [Registration, Default]
-          template: AcmeUserBundle:Registration:user_one.form.html.twig
-        profile:
-          form:
-            type: Acme\UserBundle\Form\Type\ProfileUserOneFormType
-            name: fos_user_profile_form
-            validation_groups:  [Profile, Default] 
-    user_two:
-        entity: 
-          class: Acme\UserBundle\Entity\UserTwo
-        registration:
-          form: 
-            type: Acme\UserBundle\Form\Type\RegistrationUserTwoFormType
-          template: AcmeUserBundle:Registration:user_two.form.html.twig
-        profile:
-          form: 
-            type: Acme\UserBundle\Form\Type\ProfileUserTwoFormType
+```yaml
+
+    # Acme/UserBundle/Resources/config/config.yml
+    
+    pugx_multi_user:
+      users:
+        user_one:
+            entity: 
+              class: Acme\UserBundle\Entity\UserOne
+    #          factory: 
+            registration:
+              form: 
+                type: Acme\UserBundle\Form\Type\RegistrationUserOneFormType
+                name: fos_user_registration_form
+                validation_groups:  [Registration, Default]
+              template: AcmeUserBundle:Registration:user_one.form.html.twig
+            profile:
+              form:
+                type: Acme\UserBundle\Form\Type\ProfileUserOneFormType
+                name: fos_user_profile_form
+                validation_groups:  [Profile, Default]
+    #         profile template is optional
+              template: AcmeUserBundle:Profile:user_one.form.html.twig
+    #       options- is optional for passing array of options to templates
+            options:            
+        user_two:
+            entity: 
+              class: Acme\UserBundle\Entity\UserTwo
+            registration:
+              form: 
+                type: Acme\UserBundle\Form\Type\RegistrationUserTwoFormType
+              template: AcmeUserBundle:Registration:user_two.form.html.twig
+            profile:
+              form: 
+                type: Acme\UserBundle\Form\Type\ProfileUserTwoFormType
+              template: AcmeUserBundle:Profile:user_one.form.html.twig
 ```
 
 
@@ -233,44 +240,124 @@ user_two_registration:
 
 #### Controllers
 
+Sometimes your business logic requires that you render more than one template when you register a user. You can create an array of the necessary templates in the controller.  The array of templates is passed with the variable `$templates`.  It can then be rendered in your registration template (e.g., `AcmeUserBundle:Registration:user_one.form.html.twig` using the following snippet:
+
+```twig
+
+    {% for template in templates %}
+        {% include template %}
+    {% endfor %}
+```
+
+Just be sure to render all the necessary `fos_user` user fields in the resulting templates.
+
+If you do not require multiple templates, the `$templates` variable should be omitted in the controller.
+
 RegistrationUserOneController
 
 ``` php
-<?php
 
-namespace Acme\UserBundle\Controller;
+    <?php
+
+    namespace Acme\UserBundle\Controller;
+
+    use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+
+        class RegistrationUserOneController extends Controller
+        {
+            public function registerAction()
+            {
+                if (condition1) {
+                    $templates[] = 'AcmeUserBundle:Registration:first.form.html.twig';
+                }
+                 if (condition2) {
+                    $templates[] = 'AcmeUserBundle:Registration:second.form.html.twig';
+                }
+                
+               return $this->container
+                        ->get('pugx_multi_user.registration_manager')
+                        ->register('Acme\UserBundle\Entity\UserOne', $templates);
+            }
+        }
+```
+
+RegistrationUserTwoController
+
+``` php
+
+    <?php
+
+    namespace Acme\UserBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+    use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
-class RegistrationUserOneController extends Controller
-{
-    public function registerAction()
+    class RegistrationUserTwoController extends Controller
     {
-        return $this->container
+        public function registerAction()
+        {
+            return $this->container
                     ->get('pugx_multi_user.registration_manager')
-                    ->register('Acme\UserBundle\Entity\UserOne');
+                    ->register('Acme\UserBundle\Entity\UserTwo');
+        }
     }
-}
 ```
 
-RegistrationUserTwoController
+ProfileController
+
+The ProfileController also allows the addition of templates as in the RegistrationController.  If additional templates are not required it is not necessary to extend the ProfileController.
 
 ``` php
-<?php
 
-namespace Acme\UserBundle\Controller;
+    <?php
+
+    namespace Acme\UserBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
-class RegistrationUserTwoController extends Controller
-{
-    public function registerAction()
+    use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+    use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+
+    /**
+    * @Route("/profile")
+    */
+    class ProfileController extends Controller
     {
-        return $this->container
-                    ->get('pugx_multi_user.registration_manager')
-                    ->register('Acme\UserBundle\Entity\UserTwo');
+        /**
+         * 
+         * @Route("/edit")
+         */
+        public function editAction()
+        {
+            $user = $this->getUser();
+            $class = get_class($user);
+            switch ($class) {
+                case 'Acme\UserBundle\Entity\UserOne':
+                    return $this->userOneProfileAction();
+                    break;
+                case 'Acme\UserBundle\Entity\UserTwo':
+                    return $this->userTwoProfileAction();
+                    break;
+                default:
+                    break;
+        }
+
+        private function userOneProfileAction()
+        {
+            //create optional template array here
+            //omit $templates parameter below if not used
+            return $this->container
+                    ->get('pugx_multi_user.profile_manager')
+                    ->edit('Acme\UserBundle\Entity\UserOne', $templates);
+        }
+    
+        private function userTwoProfileAction()
+        {
+            //create optional template array here
+            //omit $templates parameter below if not used
+            return $this->container
+                    ->get('pugx_multi_user.profile_manager')
+                    ->edit('Acme\UserBundle\Entity\UserTwo', $templates);
+        }
     }
-}
 ```
 
 
@@ -281,41 +368,89 @@ class RegistrationUserTwoController extends Controller
 something like this, if you are extending fosub
 
 ```
-{% extends "FOSUserBundle::layout.html.twig" %}
 
-{% block fos_user_content %}
-    {% trans_default_domain 'FOSUserBundle' %}
+    {% extends "FOSUserBundle::layout.html.twig" %}
 
-    <form action="{{ path('user_one_registration') }}" {{ form_enctype(form) }} method="POST">
+    {% block fos_user_content %}
+        {% trans_default_domain 'FOSUserBundle' %}
+
+        <form action="{{ path('user_one_registration') }}" {{ form_enctype(form) }} method="POST">
         {{ form_widget(form) }}
         <div>
             <input type="submit" value="{{ 'registration.submit'|trans }}" />
         </div>
     </form>
-{% endblock fos_user_content %}
+    {% endblock fos_user_content %}
 ```
 
+### 7. Overriding forms
+
 **Note:**
 
 > For now only registration and profile form factories are wrapped; 
-if you need creat a custom FormType you have to inject the discriminator.
+if you need to create a custom FormType you have to inject the discriminator.
+
+**Overriding FOS\UserBundle\Form\Type\RegistrationFormType, FOS\UserBundle\Form\Type\ProfileFormType forms**
+
+You can override these forms as described in the FOSUserBundle documentation if you do __NOT__ use the `options:` option in the `pugx_multi_user:` section of `config.yml`.  If you intend to override those forms and are using  the `options:` option in the `pugx_multi_user:` section of `config.yml`, you __MUST__ instead override **PUGX\MultiUserBundle\Form\RegistrationFormType** and/or **PUGX\MultiUserBundle\Form\ProfileFormType**.
 
-### 7. Using the User Manager
+
+```php
+
+    use PUGX\MultiUserBundle\Form\RegistrationFormType as BaseType;
+
+    class NewRegistrationFormType extends BaseType
+    {
+    ...
+    }
+```
+
+The options you configure in `config.yml` become available with `$this->options` in your new form.  For example:
+
+if `config.yml` contains:
+
+```yaml
+
+    pugx_multi_user:
+       user: user_one
+            options:
+                option1: true
+                option2: false
+```
+
+Then in your form you can use `$this->options['option1']` to retrieve `true`. Here's an example from a form type's listener:
+
+```php
+
+        $builder->addEventListener(FormEvents::PRE_SET_DATA,
+            function (FormEvent $event) {
+            $form = $event->getForm();
+            if ($this->options['option1']) {
+                $form->add('field1');
+            };
+            if ($this->options['option2']) {
+                $form->add('field2');
+            };
+        });
+```
+
+### 8. Using the User Manager
 
 Creating a new UserOne:
 
 ``` php
-$discriminator = $this->container->get('pugx_user.manager.user_discriminator');
-$discriminator->setClass('Acme\UserBundle\Entity\UserOne');
 
-$userManager = $this->container->get('pugx_user_manager');
+    $discriminator = $this->container->get('pugx_user.manager.user_discriminator');
+    $discriminator->setClass('Acme\UserBundle\Entity\UserOne');
+
+    $userManager = $this->container->get('pugx_user_manager');
 
-$userOne = $userManager->createUser();
+    $userOne = $userManager->createUser();
 
-$userOne->setUsername('admin');
-$userOne->setEmail('admin@mail.com');
-$userOne->setPlainPassword('123456');
-$userOne->setEnabled(true);
+    $userOne->setUsername('admin');
+    $userOne->setEmail('admin@mail.com');
+    $userOne->setPlainPassword('123456');
+    $userOne->setEnabled(true);
 
-$userManager->updateUser($userOne, true);
+    $userManager->updateUser($userOne, true);
 ```
diff --git a/Tests/Controller/ProfileManagerTest.php b/Tests/Controller/ProfileManagerTest.php
new file mode 100644
index 0000000..79b8f37
--- /dev/null
+++ b/Tests/Controller/ProfileManagerTest.php
@@ -0,0 +1,154 @@
+<?php
+
+namespace PUGX\MultiUserBundle\Tests\Controller;
+
+use PUGX\MultiUserBundle\Controller\ProfileManager;
+
+class ProfileManagerTest extends \PHPUnit_Framework_TestCase
+{
+    public function setUp()
+    {
+        $this->discriminator = $this->getMockBuilder('PUGX\MultiUserBundle\Model\UserDiscriminator')
+                ->disableOriginalConstructor()->getMock();
+
+        $this->container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')
+                ->disableOriginalConstructor()->getMock();
+
+        $this->controller = $this->getMockBuilder('FOS\UserBundle\Controller\ProfileController')
+                ->disableOriginalConstructor()->getMock();
+
+        $this->formFactory = $this->getMockBuilder('PUGX\MultiUserBundle\Form\FormFactory')
+                ->disableOriginalConstructor()->getMock();
+
+        $this->request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')
+                ->disableOriginalConstructor()->getMock();
+
+        $this->redirectResponse = $this->getMockBuilder('Symfony\Component\HttpFoundation\RedirectResponse')
+                ->disableOriginalConstructor()->getMock();
+
+        $this->form = $this->getMockBuilder('Symfony\Component\Form\Form')
+                ->disableOriginalConstructor()->getMock();
+
+        $this->twig = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Templating\EngineInterface')
+                ->disableOriginalConstructor()->getMock();
+
+        $this->formView = $this->getMockBuilder('Symfony\Component\Form\FormView')
+                ->disableOriginalConstructor()->getMock();
+
+        $this->userManager = new ProfileManager($this->discriminator, $this->container, $this->controller, $this->formFactory);
+    }
+
+    public function common()
+    {
+        $this->discriminator
+                ->expects($this->exactly(1))
+                ->method('setClass')
+                ->with('MyUser');
+
+        $this->controller
+                ->expects($this->exactly(1))
+                ->method('setContainer')
+                ->with($this->container);
+
+        $this->container
+                ->expects($this->at(0))
+                ->method('get')
+                ->with('request')
+                ->will($this->returnValue($this->request));
+    }
+
+    public function testProfileReturnRedirectResponse()
+    {
+        $this->common();
+
+        $this->controller
+                ->expects($this->exactly(1))
+                ->method('editAction')
+                ->with($this->request)
+                ->will($this->returnValue($this->redirectResponse));
+
+        $result = $this->userManager->edit('MyUser');
+
+        $this->assertSame($result, $this->redirectResponse);
+    }
+
+    public function testProfileReturnDefaultTemplate()
+    {
+        $this->common();
+
+        $this->controller
+                ->expects($this->exactly(1))
+                ->method('editAction')
+                ->with($this->request)
+                ->will($this->returnValue(null));
+
+        $this->discriminator
+                ->expects($this->exactly(1))
+                ->method('getTemplate')
+                ->with('profile')
+                ->will($this->returnValue(null));
+
+        $this->formFactory
+                ->expects($this->exactly(1))
+                ->method('createForm')
+                ->will($this->returnValue($this->form));
+
+        $this->container
+                ->expects($this->at(1))
+                ->method('get')
+                ->with('templating')
+                ->will($this->returnValue($this->twig));
+
+        $this->twig
+                ->expects($this->exactly(1))
+                ->method('renderResponse')
+                ->with('FOSUserBundle:Profile:edit.html.twig', array('form' => $this->formView, 'templates' => array()));
+
+        $this->form
+                ->expects($this->exactly(1))
+                ->method('createView')
+                ->will($this->returnValue($this->formView));
+
+        $result = $this->userManager->edit('MyUser');
+    }
+
+    public function testProfileReturnSpecificTemplate()
+    {
+        $this->common();
+
+        $this->controller
+                ->expects($this->exactly(1))
+                ->method('editAction')
+                ->with($this->request)
+                ->will($this->returnValue(null));
+
+        $this->discriminator
+                ->expects($this->exactly(1))
+                ->method('getTemplate')
+                ->with('profile')
+                ->will($this->returnValue('PUGXMultiUserBundle:Profile:edit.html.twig'));
+
+        $this->formFactory
+                ->expects($this->exactly(1))
+                ->method('createForm')
+                ->will($this->returnValue($this->form));
+
+        $this->container
+                ->expects($this->at(1))
+                ->method('get')
+                ->with('templating')
+                ->will($this->returnValue($this->twig));
+
+        $this->twig
+                ->expects($this->exactly(1))
+                ->method('renderResponse')
+                ->with('PUGXMultiUserBundle:Profile:edit.html.twig', array('form' => $this->formView, 'templates' => array()));
+
+        $this->form
+                ->expects($this->exactly(1))
+                ->method('createView')
+                ->will($this->returnValue($this->formView));
+
+        $result = $this->userManager->edit('MyUser', $templates = array());
+    }
+}
diff --git a/Tests/Controller/RegistrationManagerTest.php b/Tests/Controller/RegistrationManagerTest.php
index f6ff187..b1777a7 100644
--- a/Tests/Controller/RegistrationManagerTest.php
+++ b/Tests/Controller/RegistrationManagerTest.php
@@ -10,46 +10,46 @@ public function setUp()
     {
         $this->discriminator = $this->getMockBuilder('PUGX\MultiUserBundle\Model\UserDiscriminator')
                 ->disableOriginalConstructor()->getMock();
-        
+
         $this->container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')
                 ->disableOriginalConstructor()->getMock();
-        
+
         $this->controller = $this->getMockBuilder('FOS\UserBundle\Controller\RegistrationController')
                 ->disableOriginalConstructor()->getMock();
-        
+
         $this->formFactory = $this->getMockBuilder('PUGX\MultiUserBundle\Form\FormFactory')
                 ->disableOriginalConstructor()->getMock();
-        
+
         $this->request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')
                 ->disableOriginalConstructor()->getMock();
-        
+
         $this->redirectResponse = $this->getMockBuilder('Symfony\Component\HttpFoundation\RedirectResponse')
                 ->disableOriginalConstructor()->getMock();
-        
+
         $this->form = $this->getMockBuilder('Symfony\Component\Form\Form')
                 ->disableOriginalConstructor()->getMock();
-        
+
         $this->twig = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Templating\EngineInterface')
                 ->disableOriginalConstructor()->getMock();
-        
+
         $this->formView = $this->getMockBuilder('Symfony\Component\Form\FormView')
                 ->disableOriginalConstructor()->getMock();
-        
+
         $this->userManager = new RegistrationManager($this->discriminator, $this->container, $this->controller, $this->formFactory);
     }
-    
+
     public function common()
     {
         $this->discriminator
                 ->expects($this->exactly(1))
                 ->method('setClass')
                 ->with('MyUser');
-        
+
         $this->controller
                 ->expects($this->exactly(1))
                 ->method('setContainer')
                 ->with($this->container);
-        
+
         $this->container
                 ->expects($this->at(0))
                 ->method('get')
@@ -57,99 +57,98 @@ public function common()
                 ->will($this->returnValue($this->request));
     }
 
-
     public function testRegisterReturnRedirectResponse()
     {
         $this->common();
-        
+
         $this->controller
                 ->expects($this->exactly(1))
                 ->method('registerAction')
                 ->with($this->request)
                 ->will($this->returnValue($this->redirectResponse));
-        
+
         $result = $this->userManager->register('MyUser');
-        
+
         $this->assertSame($result, $this->redirectResponse);
     }
-    
+
     public function testRegisterReturnDefaultTemplate()
     {
         $this->common();
-        
+
         $this->controller
                 ->expects($this->exactly(1))
                 ->method('registerAction')
                 ->with($this->request)
                 ->will($this->returnValue(null));
-        
+
         $this->discriminator
                 ->expects($this->exactly(1))
                 ->method('getTemplate')
                 ->with('registration')
                 ->will($this->returnValue(null));
-        
+
         $this->formFactory
                 ->expects($this->exactly(1))
                 ->method('createForm')
                 ->will($this->returnValue($this->form));
-        
+
         $this->container
                 ->expects($this->at(1))
                 ->method('get')
                 ->with('templating')
                 ->will($this->returnValue($this->twig));
-        
+
         $this->twig
                 ->expects($this->exactly(1))
                 ->method('renderResponse')
-                ->with('FOSUserBundle:Registration:register.html.twig', array('form' => $this->formView));
-        
+                ->with('FOSUserBundle:Registration:register.html.twig', array('form' => $this->formView, 'templates' => array()));
+
         $this->form
                 ->expects($this->exactly(1))
                 ->method('createView')
                 ->will($this->returnValue($this->formView));
-                
+
         $result = $this->userManager->register('MyUser');
     }
-    
+
     public function testRegisterReturnSpecificTemplate()
     {
         $this->common();
-        
+
         $this->controller
                 ->expects($this->exactly(1))
                 ->method('registerAction')
                 ->with($this->request)
                 ->will($this->returnValue(null));
-        
+
         $this->discriminator
                 ->expects($this->exactly(1))
                 ->method('getTemplate')
                 ->with('registration')
                 ->will($this->returnValue('PUGXMultiUserBundle:Registration:register.html.twig'));
-        
+
         $this->formFactory
                 ->expects($this->exactly(1))
                 ->method('createForm')
                 ->will($this->returnValue($this->form));
-        
+
         $this->container
                 ->expects($this->at(1))
                 ->method('get')
                 ->with('templating')
                 ->will($this->returnValue($this->twig));
-        
+
         $this->twig
                 ->expects($this->exactly(1))
                 ->method('renderResponse')
-                ->with('PUGXMultiUserBundle:Registration:register.html.twig', array('form' => $this->formView));
-        
+                ->with('PUGXMultiUserBundle:Registration:register.html.twig', array('form' => $this->formView, 'templates' => array()));
+
         $this->form
                 ->expects($this->exactly(1))
                 ->method('createView')
                 ->will($this->returnValue($this->formView));
-                
-        $result = $this->userManager->register('MyUser');
+
+        $result = $this->userManager->register('MyUser', $templates = array());
     }
-}
\ No newline at end of file
+}
diff --git a/Tests/Model/UserDiscriminatorTest.php b/Tests/Model/UserDiscriminatorTest.php
index 477c4f9..649d266 100644
--- a/Tests/Model/UserDiscriminatorTest.php
+++ b/Tests/Model/UserDiscriminatorTest.php
@@ -13,16 +13,17 @@
 
 class UserDiscriminatorTest extends \PHPUnit_Framework_TestCase
 {
+
     public function setUp()
     {
         $this->session = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\Session')->disableOriginalConstructor()->getMock();
-        
-        $this->event = $this->getMockBuilder('Symfony\Component\Security\Http\Event\InteractiveLoginEvent')->disableOriginalConstructor()->getMock();       
-        $this->token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken')->disableOriginalConstructor()->getMock();      
-        $this->user = new User();  
-        $this->userInvalid = $this->getMockBuilder('InvalidUser')->disableOriginalConstructor()->getMock();  
+
+        $this->event       = $this->getMockBuilder('Symfony\Component\Security\Http\Event\InteractiveLoginEvent')->disableOriginalConstructor()->getMock();
+        $this->token       = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken')->disableOriginalConstructor()->getMock();
+        $this->user        = new User();
+        $this->userInvalid = $this->getMockBuilder('InvalidUser')->disableOriginalConstructor()->getMock();
         $this->userFactory = $this->getMockBuilder('PUGX\MultiUserBundle\Model\UserFactoryInterface')->disableOriginalConstructor()->getMock();
-                
+
         $userParameters = array(
             'entity' => array(
                 'class' => 'PUGX\MultiUserBundle\Tests\Stub\User',
@@ -43,7 +44,8 @@ public function setUp()
                     'validation_groups' => array('Profile', 'Default')
                 ),
                 'template' => 'AcmeUserBundle:Profile:user_two.form.html.twig'
-            )
+            ),
+            'options' => array('option1' => true)
         );
 
         $anotherUserParameters = array(
@@ -66,19 +68,21 @@ public function setUp()
                     'validation_groups' => array('Profile', 'Default')
                 ),
                 'template' => 'AcmeUserBundle:Profile:user_two.form.html.twig'
-            )
+            ),
+            'options' => array('option1' => true)
         );
-        
+
         $this->parameters = array('user_one' => $userParameters, 'user_two' => $anotherUserParameters);
-        
-        $this->discriminator = new UserDiscriminator($this->session, $this->parameters);
+
+        $this->discriminator = new UserDiscriminator($this->session,
+            $this->parameters);
     }
-        
+
     /**
      * @expectedException \LogicException
      */
     public function testBuildException()
-    {        
+    {
         $userParameters = array(
             'entity' => array(
                 'class' => 'FakeUser',
@@ -95,123 +99,155 @@ public function testBuildException()
                 'options' => array(
                     'validation_groups' => array('Profile', 'Default')
                 )
-            )
+            ),
+            'options' => array()
         );
-        
-        $parameters     = array('user' => $userParameters);
-        $discriminator  = new UserDiscriminator($this->session, $parameters);
+
+        $parameters    = array('user' => $userParameters);
+        $discriminator = new UserDiscriminator($this->session, $parameters);
     }
-    
+
     /**
      * 
      */
-    public function testGetClasses() 
+    public function testGetClasses()
     {
-        $this->assertEquals(array('PUGX\MultiUserBundle\Tests\Stub\User', 'PUGX\MultiUserBundle\Tests\Stub\AnotherUser'), $this->discriminator->getClasses());
+        $this->assertEquals(array('PUGX\MultiUserBundle\Tests\Stub\User', 'PUGX\MultiUserBundle\Tests\Stub\AnotherUser'),
+            $this->discriminator->getClasses());
     }
-    
+
     /**
      * @expectedException \LogicException
      */
-    public function testSetClassException() 
+    public function testSetClassException()
     {
         $this->discriminator->setClass('ArbitaryClass');
     }
-    
-    public function testGetClass() 
-    {  
-        $this->discriminator->setClass('PUGX\MultiUserBundle\Tests\Stub\AnotherUser');        
-        $this->assertEquals('PUGX\MultiUserBundle\Tests\Stub\AnotherUser', $this->discriminator->getClass());
+
+    public function testGetClass()
+    {
+        $this->discriminator->setClass('PUGX\MultiUserBundle\Tests\Stub\AnotherUser');
+        $this->assertEquals('PUGX\MultiUserBundle\Tests\Stub\AnotherUser',
+            $this->discriminator->getClass());
+    }
+
+    public function testGetUserOptions()
+    {
+        $this->discriminator->setClass('PUGX\MultiUserBundle\Tests\Stub\AnotherUser');
+        $this->assertEquals(array('option1' => true),
+            $this->discriminator->getUserOptions());
     }
-    
-    public function testSetClassPersist() 
-    {        
-        $this->session->expects($this->exactly(1))->method('set')->with(UserDiscriminator::SESSION_NAME, 'PUGX\MultiUserBundle\Tests\Stub\User');        
-        $this->discriminator->setClass('PUGX\MultiUserBundle\Tests\Stub\User', true);
+
+    public function testSetClassPersist()
+    {
+        $this->session->expects($this->exactly(1))->method('set')->with(UserDiscriminator::SESSION_NAME,
+            'PUGX\MultiUserBundle\Tests\Stub\User');
+        $this->discriminator->setClass('PUGX\MultiUserBundle\Tests\Stub\User',
+            true);
     }
-    
-    public function testGetClassDefault() 
+
+    public function testGetClassDefault()
     {
-        $this->session->expects($this->exactly(1))->method('get')->with(UserDiscriminator::SESSION_NAME, null)->will($this->onConsecutiveCalls(null));        
-        $this->assertEquals('PUGX\MultiUserBundle\Tests\Stub\User', $this->discriminator->getClass());
+        $this->session->expects($this->exactly(1))->method('get')->with(UserDiscriminator::SESSION_NAME,
+            null)->will($this->onConsecutiveCalls(null));
+        $this->assertEquals('PUGX\MultiUserBundle\Tests\Stub\User',
+            $this->discriminator->getClass());
     }
-    
-    public function testGetClassStored() 
+
+    public function testGetClassStored()
     {
-        $this->session->expects($this->exactly(1))->method('get')->with(UserDiscriminator::SESSION_NAME, null)->will($this->onConsecutiveCalls('PUGX\MultiUserBundle\Tests\Stub\AnotherUser'));
-        $this->assertEquals('PUGX\MultiUserBundle\Tests\Stub\AnotherUser', $this->discriminator->getClass());
+        $this->session->expects($this->exactly(1))->method('get')->with(UserDiscriminator::SESSION_NAME,
+            null)->will($this->onConsecutiveCalls('PUGX\MultiUserBundle\Tests\Stub\AnotherUser'));
+        $this->assertEquals('PUGX\MultiUserBundle\Tests\Stub\AnotherUser',
+            $this->discriminator->getClass());
     }
-    
+
     public function testCreateUser()
-    {        
+    {
         $expected = new AnotherUser();
-        $this->session->expects($this->exactly(0))->method('get');   
-        
+        $this->session->expects($this->exactly(0))->method('get');
+
         $this->discriminator->setClass('PUGX\MultiUserBundle\Tests\Stub\AnotherUser');
         $result = $this->discriminator->createUser();
         $this->assertEquals($expected, $result);
     }
-    
+
     public function testGetUserFactory()
     {
         $this->discriminator->setClass('PUGX\MultiUserBundle\Tests\Stub\AnotherUser');
         $result = $this->discriminator->getUserFactory();
-        $this->assertEquals('PUGX\MultiUserBundle\Tests\Stub\CustomUserFactory', $result);
+        $this->assertEquals('PUGX\MultiUserBundle\Tests\Stub\CustomUserFactory',
+            $result);
     }
-    
+
     public function testGetFormTypeRegistration()
     {
         $this->discriminator->setClass('PUGX\MultiUserBundle\Tests\Stub\User');
         $result = $this->discriminator->getFormType('registration');
-        $this->assertEquals('PUGX\MultiUserBundle\Tests\Stub\UserRegistrationForm', get_class($result));
+        $this->assertEquals('PUGX\MultiUserBundle\Tests\Stub\UserRegistrationForm',
+            get_class($result));
     }
-    
+
+    public function testGetFormTypeRegistrationWithOptions()
+    {
+        $form = new UserRegistrationForm('PUGX\MultiUserBundle\Tests\Stub\User');
+        $reflectForm = new \ReflectionClass($form);
+        $reflectOptions = $reflectForm->getProperty('options');
+        $reflectOptions->setAccessible(true);
+
+        $this->discriminator->setClass('PUGX\MultiUserBundle\Tests\Stub\User');
+        $result             = $this->discriminator->getFormType('registration');
+        $this->assertEquals(array('option1' => true), $reflectOptions->getValue($result));
+        }
+
     public function testGetFormTypeProfile()
     {
         $this->discriminator->setClass('PUGX\MultiUserBundle\Tests\Stub\User');
         $result = $this->discriminator->getFormType('profile');
-        $this->assertEquals('PUGX\MultiUserBundle\Tests\Stub\UserProfileForm', get_class($result));
+        $this->assertEquals('PUGX\MultiUserBundle\Tests\Stub\UserProfileForm',
+            get_class($result));
     }
-    
+
     public function testGetFormNameRegistration()
     {
         $this->discriminator->setClass('PUGX\MultiUserBundle\Tests\Stub\AnotherUser');
         $result = $this->discriminator->getFormName('registration');
         $this->assertEquals('fos_user_my_registration_form', $result);
     }
-    
+
     public function testGetFormNameProfile()
     {
         $this->discriminator->setClass('PUGX\MultiUserBundle\Tests\Stub\User');
         $result = $this->discriminator->getFormName('profile');
         $this->assertEquals('fos_user_profile_form', $result);
     }
-    
+
     public function testGetValidationGroupsRegistration()
     {
         $this->discriminator->setClass('PUGX\MultiUserBundle\Tests\Stub\User');
         $result = $this->discriminator->getFormValidationGroups('registration');
         $this->assertEquals(array('Registration', 'Default'), $result);
     }
-    
+
     public function testGetValidationGroupsRegistrationCustom()
     {
         $this->discriminator->setClass('PUGX\MultiUserBundle\Tests\Stub\AnotherUser');
         $result = $this->discriminator->getFormValidationGroups('registration');
         $this->assertEquals(array('MyRegistration', 'Default'), $result);
     }
-    
+
     public function testGetValidationGroupsProfile()
     {
         $this->discriminator->setClass('PUGX\MultiUserBundle\Tests\Stub\User');
         $result = $this->discriminator->getFormValidationGroups('profile');
         $this->assertEquals(array('Profile', 'Default'), $result);
     }
-    
+
     public function testGetRegistrationTemplate()
     {
         $this->discriminator->setClass('PUGX\MultiUserBundle\Tests\Stub\User');
         $result = $this->discriminator->getTemplate('registration');
-        $this->assertEquals('AcmeUserBundle:Registration:user_one.form.html.twig', $result);
+        $this->assertEquals('AcmeUserBundle:Registration:user_one.form.html.twig',
+            $result);
     }
 }
diff --git a/Tests/Stub/UserProfileForm.php b/Tests/Stub/UserProfileForm.php
index 8b17b58..5e09f60 100644
--- a/Tests/Stub/UserProfileForm.php
+++ b/Tests/Stub/UserProfileForm.php
@@ -4,8 +4,17 @@
 
 class UserProfileForm
 {
+    protected $class;
+    protected $options;
+
+    public function __construct($class, $options = null)
+    {
+        $this->class = $class;
+        $this->options = $options;
+    }
+
     public function getName()
     {
-        return "form_name";
+        return 'form_name';
     }
-}
\ No newline at end of file
+}
diff --git a/Tests/Stub/UserRegistrationForm.php b/Tests/Stub/UserRegistrationForm.php
index e9f8108..6c22a95 100644
--- a/Tests/Stub/UserRegistrationForm.php
+++ b/Tests/Stub/UserRegistrationForm.php
@@ -4,8 +4,17 @@
 
 class UserRegistrationForm
 {
+    protected $class;
+    protected $options;
+
+    public function __construct($class, $options = null)
+    {
+        $this->class = $class;
+        $this->options = $options;
+    }
+
     public function getName()
     {
-        return "form_name";
+        return 'form_name';
     }
-}
\ No newline at end of file
+}