More work on proper username detection