More changes into sessions and user controller