diff --git a/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/WebSite_login.py b/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/WebSite_login.py
index afc61a73d39ab53a5bcf67a9a987bf5df4bf696d..27f48551aebea7b05ef6f76132ce38b468d81d58 100644
--- a/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/WebSite_login.py
+++ b/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/WebSite_login.py
@@ -29,8 +29,10 @@ if (portal.portal_membership.isAnonymousUser()):
 
   query_dict = {
     'portal_status_message': message,
-    'came_from' : came_from
   }
+  if came_from:
+    query_dict['came_from'] = came_from
+
   url = '%s/login_form?%s' % (context.absolute_url(), make_query(query_dict))
   RESPONSE.redirect(url)
 else: