FIX WHEN USING THE USERNAME