Fixed user prepopulation (user detection was not properly done)