diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py
index cf72e581049..54dcc5b4362 100644
--- a/addons/auth_signup/controllers/main.py
+++ b/addons/auth_signup/controllers/main.py
@@ -42,7 +42,7 @@ class Controller(openerp.addons.web.http.Controller):
         return user_info
 
     @openerp.addons.web.http.httprequest
-    def signup(self, req, dbname, token, name, login, password):
+    def signup(self, req, dbname, token, name, login, password, state=''):
         """ sign up a user (new or existing), and log it in """
         url = '/'
         registry = RegistryManager.get(dbname)
@@ -52,7 +52,7 @@ class Controller(openerp.addons.web.http.Controller):
                 values = {'name': name, 'login': login, 'password': password}
                 credentials = res_users.signup(cr, openerp.SUPERUSER_ID, values, token)
                 cr.commit()
-                return login_and_redirect(req, *credentials)
+                return login_and_redirect(req, *credentials, redirect_url='/#%s'%state)
             except Exception as e:
                 # signup error
                 _logger.exception('error when signup')
diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py
index 7b663bd0e33..59196c4da87 100644
--- a/addons/auth_signup/res_users.py
+++ b/addons/auth_signup/res_users.py
@@ -18,6 +18,10 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>
 #
 ##############################################################################
+import random
+import time
+import urllib
+import urlparse
 
 import openerp
 from openerp.osv import osv, fields
@@ -25,11 +29,6 @@ from openerp import SUPERUSER_ID
 from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
 from openerp.tools.safe_eval import safe_eval
 
-import time
-import random
-import urllib
-import urlparse
-
 def random_token():
     # the token has an entropy of about 120 bits (6 bits/char * 20 chars)
     chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
@@ -38,7 +37,6 @@ def random_token():
 def now():
     return time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
 
-
 class res_partner(osv.Model):
     _inherit = 'res.partner'
 
@@ -132,8 +130,6 @@ class res_partner(osv.Model):
             res['email'] = partner.email or ''
         return res
 
-
-
 class res_users(osv.Model):
     _inherit = 'res.users'
 
diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js
index 509fafa35cc..0974b73292d 100644
--- a/addons/auth_signup/static/src/js/auth_signup.js
+++ b/addons/auth_signup/static/src/js/auth_signup.js
@@ -90,6 +90,7 @@ openerp.auth_signup = function(instance) {
                     name: name,
                     login: login,
                     password: password,
+                    state: $.param(this.params)
                 };
                 var url = "/auth_signup/signup?" + $.param(params);
                 window.location = url;