diff --git a/bundle/Controller/UserRegisterController.php b/bundle/Controller/UserRegisterController.php
index 511e8ea76..1e965891f 100644
--- a/bundle/Controller/UserRegisterController.php
+++ b/bundle/Controller/UserRegisterController.php
@@ -10,7 +10,7 @@
 use EzSystems\EzPlatformUserBundle\Controller\UserRegisterController as BaseUserRegisterController;
 
 /**
- * @deprecated Deprecated in 1.1 and will be removed in 2.0. Please use \EzSystems\EzPlatformUserBundle\Controller\UserRegisterController instead.
+ * @deprecated Deprecated in 1.5 and will be removed in 2.0. Please use \EzSystems\EzPlatformUserBundle\Controller\UserRegisterController instead.
  */
 class UserRegisterController extends BaseUserRegisterController
 {
diff --git a/bundle/Resources/config/services.yml b/bundle/Resources/config/services.yml
index f143ce6e3..472ede137 100644
--- a/bundle/Resources/config/services.yml
+++ b/bundle/Resources/config/services.yml
@@ -301,8 +301,6 @@ services:
         calls:
             - [setViewTemplate, ['EzSystems\RepositoryForms\User\View\UserCreateView', "$user_edit.templates.create$"]]
             - [setViewTemplate, ['EzSystems\RepositoryForms\User\View\UserUpdateView', "$user_edit.templates.update$"]]
-            - [setViewTemplate, ['EzSystems\EzPlatformUser\View\UserRegisterFormView', "$user_registration.templates.form$"]]
-            - [setViewTemplate, ['EzSystems\EzPlatformUser\View\UserRegisterConfirmView', "$user_registration.templates.confirmation$"]]
             - [setViewTemplate, ['EzSystems\RepositoryForms\Content\View\ContentCreateDraftView', "$content_edit.templates.create_draft$"]]
             - [setPagelayout, ["$pagelayout$"]]
 
diff --git a/lib/Data/User/UserRegisterData.php b/lib/Data/User/UserRegisterData.php
index 1fe6937d1..81db2fe83 100644
--- a/lib/Data/User/UserRegisterData.php
+++ b/lib/Data/User/UserRegisterData.php
@@ -11,7 +11,7 @@
 use EzSystems\EzPlatformUser\Form\Data\UserRegisterData as BaseUserRegisterData;
 
 /**
- * @deprecated Deprecated in 1.1 and will be removed in 2.0. Please use \EzSystems\EzPlatformUser\Form\Data\UserRegisterData instead.
+ * @deprecated Deprecated in 1.5 and will be removed in 2.0. Please use \EzSystems\EzPlatformUser\Form\Data\UserRegisterData instead.
  */
 class UserRegisterData extends BaseUserRegisterData
 {
diff --git a/lib/Form/Processor/User/UserRegisterFormProcessor.php b/lib/Form/Processor/User/UserRegisterFormProcessor.php
index 0a0a45208..e2a7b01d4 100644
--- a/lib/Form/Processor/User/UserRegisterFormProcessor.php
+++ b/lib/Form/Processor/User/UserRegisterFormProcessor.php
@@ -11,7 +11,7 @@
 
 /**
  * Listens for and processes User register events.
- * @deprecated Deprecated in 1.1 and will be removed in 2.0. Please use \EzSystems\EzPlatformUser\Form\Processor\UserRegisterFormProcessor instead.
+ * @deprecated Deprecated in 1.5 and will be removed in 2.0. Please use \EzSystems\EzPlatformUser\Form\Processor\UserRegisterFormProcessor instead.
  */
 class UserRegisterFormProcessor extends BaseUserRegisterFormProcessor
 {
diff --git a/lib/Form/Type/User/UserRegisterType.php b/lib/Form/Type/User/UserRegisterType.php
index 449afc41b..4cd4cd489 100644
--- a/lib/Form/Type/User/UserRegisterType.php
+++ b/lib/Form/Type/User/UserRegisterType.php
@@ -11,7 +11,7 @@
  * Form type for content edition (create/update).
  * Underlying data will be either \EzSystems\RepositoryForms\Data\Content\ContentCreateData or \EzSystems\RepositoryForms\Data\Content\ContentUpdateData
  * depending on the context (create or update).
- * @deprecated Deprecated in 1.1 and will be removed in 2.0. Please use \EzSystems\EzPlatformUser\Form\Type\UserRegisterType instead.
+ * @deprecated Deprecated in 1.5 and will be removed in 2.0. Please use \EzSystems\EzPlatformUser\Form\Type\UserRegisterType instead.
  */
 class UserRegisterType extends BaseUserRegisterType
 {
diff --git a/lib/User/ConfigurableRegistrationContentTypeLoader.php b/lib/User/ConfigurableRegistrationContentTypeLoader.php
index 3e3f8d464..455d3211b 100644
--- a/lib/User/ConfigurableRegistrationContentTypeLoader.php
+++ b/lib/User/ConfigurableRegistrationContentTypeLoader.php
@@ -11,7 +11,7 @@
 
 /**
  * Loads the registration content type from a configured, injected content type identifier.
- * @deprecated Deprecated in 1.1 and will be removed in 2.0. Please use \EzSystems\EzPlatformUser\ConfigResolver\ConfigurableRegistrationContentTypeLoader instead.
+ * @deprecated Deprecated in 1.5 and will be removed in 2.0. Please use \EzSystems\EzPlatformUser\ConfigResolver\ConfigurableRegistrationContentTypeLoader instead.
  */
 class ConfigurableRegistrationContentTypeLoader extends BaseConfigurableRegistrationContentTypeLoader
 {
diff --git a/lib/User/ConfigurableRegistrationGroupLoader.php b/lib/User/ConfigurableRegistrationGroupLoader.php
index 4bbf9ed6c..73a3b4e46 100644
--- a/lib/User/ConfigurableRegistrationGroupLoader.php
+++ b/lib/User/ConfigurableRegistrationGroupLoader.php
@@ -11,7 +11,7 @@
 
 /**
  * Loads the registration user group from a configured, injected group ID.
- * @deprecated Deprecated in 1.1 and will be removed in 2.0. Please use \EzSystems\EzPlatformUser\ConfigResolver\ConfigurableRegistrationGroupLoader instead.
+ * @deprecated Deprecated in 1.5 and will be removed in 2.0. Please use \EzSystems\EzPlatformUser\ConfigResolver\ConfigurableRegistrationGroupLoader instead.
  */
 class ConfigurableRegistrationGroupLoader extends BaseConfigurableRegistrationGroupLoader
 {
diff --git a/lib/User/ConfigurableSudoRepositoryLoader.php b/lib/User/ConfigurableSudoRepositoryLoader.php
index a5c3a3aec..dcddfa0b9 100644
--- a/lib/User/ConfigurableSudoRepositoryLoader.php
+++ b/lib/User/ConfigurableSudoRepositoryLoader.php
@@ -8,6 +8,7 @@
 namespace EzSystems\RepositoryForms\User;
 
 use EzSystems\RepositoryForms\ConfigResolver\ConfigurableSudoRepositoryLoader as BaseConfigurableSudoRepositoryLoader;
+
 /**
  * A repository data loader that uses the sudo() method.
  *
diff --git a/lib/User/RegistrationContentTypeLoader.php b/lib/User/RegistrationContentTypeLoader.php
index 67e11d5cf..06a5059c2 100644
--- a/lib/User/RegistrationContentTypeLoader.php
+++ b/lib/User/RegistrationContentTypeLoader.php
@@ -11,7 +11,7 @@
 
 /**
  * Loads the content type used by user registration.
- * @deprecated Deprecated in 1.1 and will be removed in 2.0. Please use \EzSystems\EzPlatformUser\ConfigResolver\RegistrationContentTypeLoader instead.
+ * @deprecated Deprecated in 1.5 and will be removed in 2.0. Please use \EzSystems\EzPlatformUser\ConfigResolver\RegistrationContentTypeLoader instead.
  */
 interface RegistrationContentTypeLoader extends BaseRegistrationContentTypeLoader
 {
diff --git a/lib/User/RegistrationGroupLoader.php b/lib/User/RegistrationGroupLoader.php
index 05b773198..abf94739d 100644
--- a/lib/User/RegistrationGroupLoader.php
+++ b/lib/User/RegistrationGroupLoader.php
@@ -11,7 +11,7 @@
 
 /**
  * Used to load a user group during registration.
- * @deprecated Deprecated in 1.1 and will be removed in 2.0. Please use \EzSystems\EzPlatformUser\ConfigResolver\RegistrationGroupLoader instead.
+ * @deprecated Deprecated in 1.5 and will be removed in 2.0. Please use \EzSystems\EzPlatformUser\ConfigResolver\RegistrationGroupLoader instead.
  */
 interface RegistrationGroupLoader extends BaseRegistrationGroupLoader
 {
diff --git a/lib/User/View/UserRegisterConfirmView.php b/lib/User/View/UserRegisterConfirmView.php
index 476377b6f..979d21491 100644
--- a/lib/User/View/UserRegisterConfirmView.php
+++ b/lib/User/View/UserRegisterConfirmView.php
@@ -5,7 +5,7 @@
  */
 namespace EzSystems\RepositoryForms\User\View;
 
-use EzSystems\EzPlatformUser\View\UserRegisterConfirmView as BaseRegisterConfirmView;
+use EzSystems\EzPlatformUser\View\ForgotPassword\UserRegisterConfirmView as BaseRegisterConfirmView;
 
 /**
  * @deprecated Deprecated in 1.1 and will be removed in 2.0. Please use EzSystems\EzPlatformUser\View\UserRegisterConfirmView instead.
diff --git a/lib/User/View/UserRegisterFormView.php b/lib/User/View/UserRegisterFormView.php
index e0a664398..e670bf43c 100644
--- a/lib/User/View/UserRegisterFormView.php
+++ b/lib/User/View/UserRegisterFormView.php
@@ -5,7 +5,7 @@
  */
 namespace EzSystems\RepositoryForms\User\View;
 
-use EzSystems\EzPlatformUser\View\UserRegisterFormView as BaseUserRegisterFormView;
+use EzSystems\EzPlatformUser\View\ForgotPassword\UserRegisterFormView as BaseUserRegisterFormView;
 
 /**
  * @deprecated Deprecated in 1.1 and will be removed in 2.0. Please use EzSystems\EzPlatformUser\View\UserRegisterFormView instead.