[FIX] Use session ID for user uniqueness

May fix #1537 once merged.