Fix small bug and add proper user data