SWEB-453 validating user sess withtoken
SWEB-453 merge conflics e5b4008..9e5fd33 cleaned up