Now it saves both in cookies and session, issue #29