merge from master - avoid multiple select in nickname choice - use
timestamp