Updated lockout mechanism to be unique for each user
Fixed merge conflicts