Fixed return url stuff after login/logout/signup/updatebkt