Fixing issues with user not being fetched befor confirm