Explicit returns
Remove "without username" test