Added token validation and salt for user