diff --git a/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style/Base_activateSimpleView.py b/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style/Base_activateSimpleView.py
index 538e5e05927b9bec56a01eec566f501c6ad93648..0b6871575274649831a9aa19f2a562357a9e84c2 100644
--- a/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style/Base_activateSimpleView.py
+++ b/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style/Base_activateSimpleView.py
@@ -10,13 +10,13 @@ priority = 3
 user = portal.portal_membership.getAuthenticatedMember()
 person_value = user.getUserValue()
 if person_value is None:
-  portal.changeSkin(None)
+  portal.changeSkin(previous_skin_selection)
   return context.Base_redirect('view', keep_items=dict(
               portal_status_message=translateString(
                         "No person found for your user")))
 
 if person_value.getDefaultEmailText('') in ('', None):
-  portal.changeSkin(None)
+  portal.changeSkin(previous_skin_selection)
   return context.Base_redirect('view', keep_items=dict(
               portal_status_message=translateString(
                         "You haven't defined your email address")))
@@ -54,6 +54,6 @@ activity_context.activate(
 
 context.activate(activity='SQLQueue', after_tag=tag).getTitle()
 
-portal.changeSkin(None)
+portal.changeSkin(previous_skin_selection)
 return context.Base_redirect('view', keep_items=dict(
               portal_status_message=translateString("Report Started")))
diff --git a/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style/Base_activateSimpleView.xml b/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style/Base_activateSimpleView.xml
index 7de91450d4099c6b19fae692bf53808b755a5b02..d5f6f14e021181803eb92d17decbd04a7ae34c07 100644
--- a/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style/Base_activateSimpleView.xml
+++ b/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style/Base_activateSimpleView.xml
@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>deferred_style_dialog_method, **kw</string> </value>
+            <value> <string>deferred_style_dialog_method, previous_skin_selection=None, **kw</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
diff --git a/bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_callDialogMethod.py b/bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_callDialogMethod.py
index a74aeee56395ea98bac384643ea066a632801253..31c1099f869ce7c32d0282b9d937bce60db11f98 100644
--- a/bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_callDialogMethod.py
+++ b/bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_callDialogMethod.py
@@ -215,6 +215,7 @@ if dialog_category == "object_search" :
 # Handle deferred style, unless we are executing the update action
 if dialog_method != update_method and kw.get('deferred_style', 0):
   kw['deferred_portal_skin'] = kw.get('portal_skin', None)
+  kw['previous_skin_selection'] = portal.portal_skins.getCurrentSkinName()
   # XXX Hardcoded Deferred style name
   kw['portal_skin'] = 'Deferred'