fix some isue after keeping one user login
fix some issue after checking it to keep only session per user
Merge branch 'master' into uni-test