Another attempt at fixing the username issue