diff --git a/Controller/AuthorizeController.php b/Controller/AuthorizeController.php
index 1a9e9478..16ba8188 100644
--- a/Controller/AuthorizeController.php
+++ b/Controller/AuthorizeController.php
@@ -87,7 +87,7 @@ public function authorizeAction(Request $request)
         }
 
         return $this->container->get('templating')->renderResponse(
-            'FOSOAuthServerBundle:Authorize:authorize.html.'.$this->container->getParameter('fos_oauth_server.template.engine'),
+            $this->container->getParameter('fos_oauth_server.authorize_template').$this->container->getParameter('fos_oauth_server.template.engine'),
             array(
                 'form'   => $form->createView(),
                 'client' => $this->getClient(),
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 15a30fa9..56e4a182 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -91,6 +91,7 @@ private function addServiceSection(ArrayNodeDefinition $node)
                         ->children()
                             ->scalarNode('storage')->defaultValue('fos_oauth_server.storage.default')->cannotBeEmpty()->end()
                             ->scalarNode('user_provider')->defaultNull()->end()
+                            ->scalarNode('authorize_template')->defaultValue('FOSOAuthServerBundle:Authorize:authorize.html.')->end()
                             ->scalarNode('client_manager')->defaultValue('fos_oauth_server.client_manager.default')->end()
                             ->scalarNode('access_token_manager')->defaultValue('fos_oauth_server.access_token_manager.default')->end()
                             ->scalarNode('refresh_token_manager')->defaultValue('fos_oauth_server.refresh_token_manager.default')->end()
diff --git a/Resources/config/oauth.xml b/Resources/config/oauth.xml
index 62e607c8..dd422c45 100644
--- a/Resources/config/oauth.xml
+++ b/Resources/config/oauth.xml
@@ -15,6 +15,7 @@
             <argument type="service" id="fos_oauth_server.refresh_token_manager" />
             <argument type="service" id="fos_oauth_server.auth_code_manager" />
             <argument type="service" id="fos_oauth_server.user_provider" on-invalid="null" />
+            <argument type="service" id="fos_oauth_server.authorize_template" />
             <argument type="service" id="security.encoder_factory" />
         </service>
 
diff --git a/Resources/doc/configuration_reference.md b/Resources/doc/configuration_reference.md
index 9529fa32..934af54e 100644
--- a/Resources/doc/configuration_reference.md
+++ b/Resources/doc/configuration_reference.md
@@ -24,6 +24,7 @@ fos_oauth_server:
     service:
         storage:                fos_oauth_server.storage.default
         user_provider:          ~
+        authorize_template:     "FOSOAuthServerBundle:Authorize:authorize.html."
         client_manager:         fos_oauth_server.client_manager.default
         access_token_manager:   fos_oauth_server.access_token_manager.default
         refresh_token_manager:  fos_oauth_server.refresh_token_manager.default