User session issues fix