Username limit fix