Small Patch for first time users

Fixed the error where the unique id was not catch first time usage.